diff --git a/Gemfile b/Gemfile
index 91b55645..76a67a82 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "rails", "~> 4.1.0"
+gem "rails", "4.2.0.beta1"
 gem "omniauth", "~> 1.2.0"
 gem "omniauth-oauth2", "~> 1.1.0"
 gem "rdoc"
@@ -25,5 +25,5 @@ platforms :ruby do
 end
 
 group :mongoid do
-  gem "mongoid", "~> 4.0.0"
+  gem "mongoid", github: "mongoid/mongoid", branch: "master"
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index f8217633..73796729 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,14 @@
+GIT
+  remote: git://github.com/mongoid/mongoid.git
+  revision: 5ba2e1fb4cb8189c9890e29c19cf4e16c25e4bc5
+  branch: master
+  specs:
+    mongoid (4.0.0)
+      activemodel (~> 4.0)
+      moped (~> 2.0.0)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
+
 PATH
   remote: .
   specs:
@@ -5,39 +16,47 @@ PATH
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.5)
-      actionpack (= 4.1.5)
-      actionview (= 4.1.5)
-      mail (~> 2.5.4)
-    actionpack (4.1.5)
-      actionview (= 4.1.5)
-      activesupport (= 4.1.5)
-      rack (~> 1.5.2)
+    actionmailer (4.2.0.beta1)
+      actionpack (= 4.2.0.beta1)
+      actionview (= 4.2.0.beta1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 1.0, >= 1.0.2)
+    actionpack (4.2.0.beta1)
+      actionview (= 4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      rack (~> 1.6.0.beta)
       rack-test (~> 0.6.2)
-    actionview (4.1.5)
-      activesupport (= 4.1.5)
+      rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
+      rails-dom-testing (~> 1.0, >= 1.0.2)
+    actionview (4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.5)
-      activesupport (= 4.1.5)
+      rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
+      rails-dom-testing (~> 1.0, >= 1.0.2)
+    activejob (4.2.0.beta1)
+      globalid (>= 0.2.3)
+    activemodel (4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
       builder (~> 3.1)
-    activerecord (4.1.5)
-      activemodel (= 4.1.5)
-      activesupport (= 4.1.5)
-      arel (~> 5.0.0)
-    activesupport (4.1.5)
-      i18n (~> 0.6, >= 0.6.9)
+    activerecord (4.2.0.beta1)
+      activemodel (= 4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
+      arel (>= 6.0.0.beta1, < 6.1)
+    activesupport (4.2.0.beta1)
+      i18n (>= 0.7.0.beta1, < 0.8)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    arel (5.0.1.20140414130214)
+    arel (6.0.0.beta1)
     bcrypt (3.1.7)
     bson (2.3.0)
     builder (3.2.2)
@@ -45,25 +64,21 @@ GEM
     erubis (2.7.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
+    globalid (0.2.3)
+      activesupport (>= 4.1.0)
     hashie (3.2.0)
     hike (1.2.3)
-    i18n (0.6.11)
+    i18n (0.7.0.beta1)
     json (1.8.1)
     jwt (1.0.0)
-    mail (2.5.4)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
+    mail (2.6.1)
+      mime-types (>= 1.16, < 3)
     metaclass (0.0.4)
-    mime-types (1.25.1)
+    mime-types (2.3)
     mini_portile (0.6.0)
     minitest (5.4.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    mongoid (4.0.0)
-      activemodel (~> 4.0)
-      moped (~> 2.0.0)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
     moped (2.0.0)
       bson (~> 2.2)
       connection_pool (~> 2.0)
@@ -95,48 +110,53 @@ GEM
     optionable (0.2.0)
     origin (2.1.1)
     orm_adapter (0.5.0)
-    polyglot (0.3.5)
-    rack (1.5.2)
+    rack (1.6.0.beta)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.1.5)
-      actionmailer (= 4.1.5)
-      actionpack (= 4.1.5)
-      actionview (= 4.1.5)
-      activemodel (= 4.1.5)
-      activerecord (= 4.1.5)
-      activesupport (= 4.1.5)
+    rails (4.2.0.beta1)
+      actionmailer (= 4.2.0.beta1)
+      actionpack (= 4.2.0.beta1)
+      actionview (= 4.2.0.beta1)
+      activejob (= 4.2.0.beta1)
+      activemodel (= 4.2.0.beta1)
+      activerecord (= 4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.5)
-      sprockets-rails (~> 2.0)
-    railties (4.1.5)
-      actionpack (= 4.1.5)
-      activesupport (= 4.1.5)
+      railties (= 4.2.0.beta1)
+      sprockets-rails (~> 3.0.0.beta1)
+    rails-deprecated_sanitizer (1.0.2)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.2)
+      activesupport
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    railties (4.2.0.beta1)
+      actionpack (= 4.2.0.beta1)
+      activesupport (= 4.2.0.beta1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
+    responders (2.0.0)
+      railties (>= 4.2.0.alpha, < 5)
     ruby-openid (2.5.0)
     sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
+    sprockets-rails (3.0.0.beta1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
       sprockets (~> 2.8)
     sqlite3 (1.3.9)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
-    treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     warden (1.2.3)
@@ -155,12 +175,12 @@ DEPENDENCIES
   devise!
   jruby-openssl
   mocha (~> 1.1)
-  mongoid (~> 4.0.0)
+  mongoid!
   omniauth (~> 1.2.0)
   omniauth-facebook
   omniauth-oauth2 (~> 1.1.0)
   omniauth-openid (~> 1.0.1)
-  rails (~> 4.1.0)
+  rails (= 4.2.0.beta1)
   rdoc
   sqlite3
   webrat (= 0.7.3)
diff --git a/gemfiles/Gemfile.rails-3.2-stable.lock b/gemfiles/Gemfile.rails-3.2-stable.lock
index fb472126..72f0d6b3 100644
--- a/gemfiles/Gemfile.rails-3.2-stable.lock
+++ b/gemfiles/Gemfile.rails-3.2-stable.lock
@@ -53,6 +53,7 @@ PATH
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
 
@@ -125,6 +126,8 @@ GEM
     rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
+    responders (1.1.1)
+      railties (>= 3.2, < 4.2)
     ruby-openid (2.5.0)
     sprockets (2.2.2)
       hike (~> 1.2)
diff --git a/gemfiles/Gemfile.rails-4.0-stable.lock b/gemfiles/Gemfile.rails-4.0-stable.lock
index 29155e9f..f8558f4d 100644
--- a/gemfiles/Gemfile.rails-4.0-stable.lock
+++ b/gemfiles/Gemfile.rails-4.0-stable.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/rails/rails.git
-  revision: d01651a360a0ecea6eb78dcb03fc44120bd83495
+  revision: 2d8886e05104316273a0f95dfbcd171d3b12678b
   branch: 4-0-stable
   specs:
     actionmailer (4.0.9)
@@ -47,6 +47,7 @@ PATH
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
+      responders
       thread_safe (~> 0.1)
       warden (~> 1.2.3)
 
@@ -120,6 +121,8 @@ GEM
     rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
+    responders (1.1.1)
+      railties (>= 3.2, < 4.2)
     ruby-openid (2.5.0)
     sprockets (2.12.1)
       hike (~> 1.2)
diff --git a/gemfiles/Gemfile.rails-head b/gemfiles/Gemfile.rails-4.1-stable
similarity index 84%
rename from gemfiles/Gemfile.rails-head
rename to gemfiles/Gemfile.rails-4.1-stable
index f4b9bd23..f4f0e37c 100644
--- a/gemfiles/Gemfile.rails-head
+++ b/gemfiles/Gemfile.rails-4.1-stable
@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 gemspec path: '..'
 
-gem "rails", "4.2.0.beta1"
+gem "rails", github: 'rails/rails', branch: '4-1-stable'
 gem "omniauth", "~> 1.2.0"
 gem "omniauth-oauth2", "~> 1.1.0"
 gem "rdoc"
@@ -25,5 +25,5 @@ platforms :ruby do
 end
 
 group :mongoid do
-  gem "mongoid", github: "mongoid/mongoid", branch: "master"
+  gem "mongoid", "~> 4.0.0"
 end
diff --git a/gemfiles/Gemfile.rails-head.lock b/gemfiles/Gemfile.rails-4.1-stable.lock
similarity index 56%
rename from gemfiles/Gemfile.rails-head.lock
rename to gemfiles/Gemfile.rails-4.1-stable.lock
index ab10f873..abe9fba4 100644
--- a/gemfiles/Gemfile.rails-head.lock
+++ b/gemfiles/Gemfile.rails-4.1-stable.lock
@@ -1,16 +1,5 @@
-GIT
-  remote: git://github.com/mongoid/mongoid.git
-  revision: 5ba2e1fb4cb8189c9890e29c19cf4e16c25e4bc5
-  branch: master
-  specs:
-    mongoid (4.0.0)
-      activemodel (~> 4.0)
-      moped (~> 2.0.0)
-      origin (~> 2.1)
-      tzinfo (>= 0.3.37)
-
 PATH
-  remote: ..
+  remote: .
   specs:
     devise (3.3.0)
       bcrypt (~> 3.0)
@@ -23,40 +12,33 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.0.beta1)
-      actionpack (= 4.2.0.beta1)
-      actionview (= 4.2.0.beta1)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.2)
-    actionpack (4.2.0.beta1)
-      actionview (= 4.2.0.beta1)
-      activesupport (= 4.2.0.beta1)
-      rack (~> 1.6.0.beta)
+    actionmailer (4.1.5)
+      actionpack (= 4.1.5)
+      actionview (= 4.1.5)
+      mail (~> 2.5.4)
+    actionpack (4.1.5)
+      actionview (= 4.1.5)
+      activesupport (= 4.1.5)
+      rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-      rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
-      rails-dom-testing (~> 1.0, >= 1.0.2)
-    actionview (4.2.0.beta1)
-      activesupport (= 4.2.0.beta1)
+    actionview (4.1.5)
+      activesupport (= 4.1.5)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-      rails-deprecated_sanitizer (~> 1.0, >= 1.0.2)
-      rails-dom-testing (~> 1.0, >= 1.0.2)
-    activejob (4.2.0.beta1)
-      globalid (>= 0.2.3)
-    activemodel (4.2.0.beta1)
-      activesupport (= 4.2.0.beta1)
+    activemodel (4.1.5)
+      activesupport (= 4.1.5)
       builder (~> 3.1)
-    activerecord (4.2.0.beta1)
-      activemodel (= 4.2.0.beta1)
-      activesupport (= 4.2.0.beta1)
-      arel (>= 6.0.0.beta1, < 6.1)
-    activesupport (4.2.0.beta1)
-      i18n (>= 0.7.0.beta1, < 0.8)
+    activerecord (4.1.5)
+      activemodel (= 4.1.5)
+      activesupport (= 4.1.5)
+      arel (~> 5.0.0)
+    activesupport (4.1.5)
+      i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    arel (6.0.0.beta1)
+    arel (5.0.1.20140414130214)
     bcrypt (3.1.7)
     bson (2.3.0)
     builder (3.2.2)
@@ -64,21 +46,25 @@ GEM
     erubis (2.7.0)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    globalid (0.2.3)
-      activesupport (>= 4.1.0)
     hashie (3.2.0)
     hike (1.2.3)
-    i18n (0.7.0.beta1)
+    i18n (0.6.11)
     json (1.8.1)
     jwt (1.0.0)
-    mail (2.6.1)
-      mime-types (>= 1.16, < 3)
+    mail (2.5.4)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
     metaclass (0.0.4)
-    mime-types (2.3)
+    mime-types (1.25.1)
     mini_portile (0.6.0)
     minitest (5.4.0)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
+    mongoid (4.0.0)
+      activemodel (~> 4.0)
+      moped (~> 2.0.0)
+      origin (~> 2.1)
+      tzinfo (>= 0.3.37)
     moped (2.0.0)
       bson (~> 2.2)
       connection_pool (~> 2.0)
@@ -110,53 +96,50 @@ GEM
     optionable (0.2.0)
     origin (2.1.1)
     orm_adapter (0.5.0)
-    rack (1.6.0.beta)
+    polyglot (0.3.5)
+    rack (1.5.2)
     rack-openid (1.3.1)
       rack (>= 1.1.0)
       ruby-openid (>= 2.1.8)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.2.0.beta1)
-      actionmailer (= 4.2.0.beta1)
-      actionpack (= 4.2.0.beta1)
-      actionview (= 4.2.0.beta1)
-      activejob (= 4.2.0.beta1)
-      activemodel (= 4.2.0.beta1)
-      activerecord (= 4.2.0.beta1)
-      activesupport (= 4.2.0.beta1)
+    rails (4.1.5)
+      actionmailer (= 4.1.5)
+      actionpack (= 4.1.5)
+      actionview (= 4.1.5)
+      activemodel (= 4.1.5)
+      activerecord (= 4.1.5)
+      activesupport (= 4.1.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0.beta1)
-      sprockets-rails (~> 3.0.0.beta1)
-    rails-deprecated_sanitizer (1.0.2)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.2)
-      activesupport
-      nokogiri (~> 1.6.0)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    railties (4.2.0.beta1)
-      actionpack (= 4.2.0.beta1)
-      activesupport (= 4.2.0.beta1)
+      railties (= 4.1.5)
+      sprockets-rails (~> 2.0)
+    railties (4.1.5)
+      actionpack (= 4.1.5)
+      activesupport (= 4.1.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
-    responders (2.0.0)
-      railties (>= 4.2.0.alpha, < 5)
+    responders (1.1.0)
+      railties (>= 3.2, < 5)
     ruby-openid (2.5.0)
     sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (3.0.0.beta1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (2.1.3)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
       sprockets (~> 2.8)
     sqlite3 (1.3.9)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
+    treetop (1.4.15)
+      polyglot
+      polyglot (>= 0.3.1)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     warden (1.2.3)
@@ -175,12 +158,12 @@ DEPENDENCIES
   devise!
   jruby-openssl
   mocha (~> 1.1)
-  mongoid!
+  mongoid (~> 4.0.0)
   omniauth (~> 1.2.0)
   omniauth-facebook
   omniauth-oauth2 (~> 1.1.0)
   omniauth-openid (~> 1.0.1)
-  rails (= 4.2.0.beta1)
+  rails (~> 4.1.0)
   rdoc
   sqlite3
   webrat (= 0.7.3)