diff --git a/Gemfile b/Gemfile
index bd964ffd3..ab1dd82d8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gem 'rails', '3.2.8' #, :git => 'git://github.com/rails/rails.git'
 
 gem 'pg', '~> 0.14.0'
 # gem 'silent-postgres', :git => 'git://github.com/dolzenko/silent-postgres.git' #'~> 0.1.1'
-gem 'redhillonrails_core', :git => 'git://github.com/chipiga/redhillonrails_core.git', :branch => 'rails31' # '~> 2.0.0.pre' # deprecated
+gem 'redhillonrails_core', :git => 'git://github.com/warpc/redhillonrails_core.git', :branch => 'rails31' # '~> 2.0.0.pre' # deprecated
 # gem 'schema_plus', '~> 0.2.1' # buggy shit!
 
 gem 'devise', '~> 2.1.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 23bdbb81d..0d8a21405 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,3 @@
-GIT
-  remote: git://github.com/chipiga/redhillonrails_core.git
-  revision: 5f58167c41882890c223168b0a5521d99e8d92aa
-  branch: rails31
-  specs:
-    redhillonrails_core (2.0.0.pre)
-      activerecord (>= 3.1.0.rc)
-
 GIT
   remote: git://github.com/rdblue/grack.git
   revision: 020be3fef3fb308b9d214252522aa5945bf6584a
@@ -21,6 +13,14 @@ GIT
       mime-types (~> 1.15)
       posix-spawn (~> 0.3.6)
 
+GIT
+  remote: git://github.com/warpc/redhillonrails_core.git
+  revision: c0945a4c6ad4bae4ca2750b105efcff162408b15
+  branch: rails31
+  specs:
+    redhillonrails_core (2.0.0.pre)
+      activerecord (>= 3.1.0.rc)
+
 GEM
   remote: http://rubygems.org/
   specs:
diff --git a/db/schema.rb b/db/schema.rb
index 7d4175660..4a941ab09 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -339,7 +339,7 @@ ActiveRecord::Schema.define(:version => 20120914160741) do
     t.integer  "maintainer_id"
   end
 
-  add_index "projects", ["owner_id"], :name => "index_projects_on_name_and_owner_id_and_owner_type", :unique => true, :case_sensitive => false
+  add_index "projects", ["owner_id", "name", "owner_type"], :name => "index_projects_on_name_and_owner_id_and_owner_type", :unique => true, :case_sensitive => false
 
   create_table "pull_requests", :force => true do |t|
     t.integer "issue_id",        :null => false