diff --git a/Gemfile b/Gemfile
index e9e656b..a5e382f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -14,9 +14,10 @@ group :assets do
   gem 'bootstrap-sass'
 end
 
-gem 'couch_potato' , :git => 'git://github.com/bterkuile/couch_potato.git'
-gem 'simply_stored' , :git => 'git://github.com/bterkuile/simply_stored.git'
-gem 'devise', '2.0.4'
+gem 'couch_potato' , github: 'bterkuile/couch_potato'
+gem 'simply_stored' , github: 'bterkuile/simply_stored'
+gem 'orm_adapter', github: 'bterkuile/orm_adapter'
+gem 'devise'
 gem 'devise_simply_stored'
 gem 'tinymce-rails'
 gem 'haml-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 74c9980..fe8d53c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,15 +1,21 @@
 GIT
   remote: git://github.com/bterkuile/couch_potato.git
-  revision: ff7505c432cabfccb55cfa732a548d9449d8250c
+  revision: 7712a8d12c319f2e165733800795acbb599638d2
   specs:
-    couch_potato (0.7.0.pre.1)
+    couch_potato (0.7.1)
       activemodel
       couchrest (>= 1.0.1)
-      json (~> 1.6.0)
+      json (~> 1.6)
+
+GIT
+  remote: git://github.com/bterkuile/orm_adapter.git
+  revision: 48b9ce9aedd1fe9f6a0a011e737b7dd395d26155
+  specs:
+    orm_adapter (0.4.0)
 
 GIT
   remote: git://github.com/bterkuile/simply_stored.git
-  revision: fe749c792e303817f825fa4964936cc68a62b14b
+  revision: b62ce6c7a0e453230fe807075926c637ceefedc8
   specs:
     simply_stored (1.0.0)
       activesupport
@@ -22,13 +28,13 @@ PATH
     cmtool (0.5.0)
       bourbon
       coffee-script
-      devise (= 2.0.4)
+      devise
       devise_simply_stored
       email_validator
       haml-rails
       jquery-rails
       paperclip
-      rails (~> 3.2.2)
+      rails (>= 3.2.2)
       sass-rails
       slim-rails
       tinymce-rails
@@ -36,194 +42,178 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.9)
-      actionpack (= 3.2.9)
-      mail (~> 2.4.4)
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-      builder (~> 3.0.0)
+    actionmailer (4.0.0)
+      actionpack (= 4.0.0)
+      mail (~> 2.5.3)
+    actionpack (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
       erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
-      builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-      arel (~> 3.0.2)
-      tzinfo (~> 0.3.29)
-    activeresource (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    addressable (2.3.2)
-    arel (3.0.2)
-    bcrypt-ruby (3.0.1)
-    bootstrap-sass (2.2.1.1)
+      rack (~> 1.5.2)
+      rack-test (~> 0.6.2)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    arel (4.0.0)
+    atomic (1.1.14)
+    bcrypt-ruby (3.1.2)
+    bootstrap-sass (2.3.2.2)
       sass (~> 3.2)
-    bourbon (3.0.1)
+    bourbon (3.1.8)
       sass (>= 3.2.0)
       thor
-    builder (3.0.4)
-    capybara (2.0.1)
+    builder (3.1.4)
+    capybara (2.1.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (~> 2.0)
-      xpath (~> 1.0.0)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    cocaine (0.4.2)
+      xpath (~> 2.0)
+    climate_control (0.0.3)
+      activesupport (>= 3.0)
+    cocaine (0.5.1)
+      climate_control (>= 0.0.3, < 1.0)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.4.0)
-    couchrest (1.1.3)
+    coffee-script-source (1.6.3)
+    couchrest (1.2.0)
       mime-types (~> 1.15)
       multi_json (~> 1.0)
       rest-client (~> 1.6.1)
     daemons (1.1.9)
-    devise (2.0.4)
+    devise (3.1.0)
       bcrypt-ruby (~> 3.0)
-      orm_adapter (~> 0.0.3)
-      railties (~> 3.1)
-      warden (~> 1.1.1)
+      orm_adapter (~> 0.1)
+      railties (>= 3.2.6, < 5)
+      thread_safe (~> 0.1)
+      warden (~> 1.2.3)
     devise_simply_stored (0.0.3)
       devise
-    diff-lcs (1.1.3)
-    email_validator (1.3.0)
+    diff-lcs (1.2.4)
+    email_validator (1.4.0)
       activemodel
     erubis (2.7.0)
-    eventmachine (1.0.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    factory_girl (4.1.0)
+    eventmachine (1.0.3)
+    execjs (2.0.1)
+    factory_girl (4.2.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.1.0)
-      factory_girl (~> 4.1.0)
+    factory_girl_rails (4.2.1)
+      factory_girl (~> 4.2.0)
       railties (>= 3.0.0)
-    ffi (1.2.0)
-    haml (3.1.7)
-    haml-rails (0.3.5)
+    haml (4.0.3)
+      tilt
+    haml-rails (0.4)
       actionpack (>= 3.1, < 4.1)
       activesupport (>= 3.1, < 4.1)
-      haml (~> 3.1)
+      haml (>= 3.1, < 4.1)
       railties (>= 3.1, < 4.1)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    jquery-rails (2.1.4)
+    hike (1.2.3)
+    i18n (0.6.5)
+    jquery-rails (3.0.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.6.7)
-    libwebsocket (0.1.7.1)
-      addressable
-      websocket
-    mail (2.4.4)
-      i18n (>= 0.4.0)
+    json (1.8.0)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.19)
-    multi_json (1.5.0)
-    nokogiri (1.5.5)
-    orm_adapter (0.0.7)
-    paperclip (3.3.1)
+    mime-types (1.25)
+    mini_portile (0.5.1)
+    minitest (4.7.5)
+    multi_json (1.8.0)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    paperclip (3.5.1)
       activemodel (>= 3.0.0)
-      activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
-      cocaine (~> 0.4.0)
+      cocaine (~> 0.5.0)
       mime-types
     polyglot (0.3.3)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-ssl (1.3.2)
-      rack
+    rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.9)
-      actionmailer (= 3.2.9)
-      actionpack (= 3.2.9)
-      activerecord (= 3.2.9)
-      activeresource (= 3.2.9)
-      activesupport (= 3.2.9)
-      bundler (~> 1.0)
-      railties (= 3.2.9)
-    railties (3.2.9)
-      actionpack (= 3.2.9)
-      activesupport (= 3.2.9)
-      rack-ssl (~> 1.3.2)
+    rails (4.0.0)
+      actionmailer (= 4.0.0)
+      actionpack (= 4.0.0)
+      activerecord (= 4.0.0)
+      activesupport (= 4.0.0)
+      bundler (>= 1.3.0, < 2.0)
+      railties (= 4.0.0)
+      sprockets-rails (~> 2.0.0)
+    railties (4.0.0)
+      actionpack (= 4.0.0)
+      activesupport (= 4.0.0)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
-      thor (>= 0.14.6, < 2.0)
-    rake (10.0.3)
-    rdoc (3.12)
-      json (~> 1.4)
+      thor (>= 0.18.1, < 2.0)
+    rake (10.1.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec-core (2.12.2)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
-    rspec-rails (2.12.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    rspec-rails (2.14.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rubyzip (0.9.9)
-    sass (3.2.3)
-    sass-rails (3.2.5)
-      railties (~> 3.2.0)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    sass (3.2.10)
+    sass-rails (4.0.0)
+      railties (>= 4.0.0.beta, < 5.0)
       sass (>= 3.1.10)
-      tilt (~> 1.3)
-    selenium-webdriver (2.27.2)
-      childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
-      multi_json (~> 1.0)
-      rubyzip
-    slim (1.3.4)
-      temple (~> 0.5.5)
-      tilt (~> 1.3.3)
-    slim-rails (1.0.3)
-      actionpack (~> 3.0)
-      activesupport (~> 3.0)
-      railties (~> 3.0)
-      slim (~> 1.0)
-    sprockets (2.2.2)
+      sprockets-rails (~> 2.0.0)
+    slim (2.0.1)
+      temple (~> 0.6.6)
+      tilt (>= 1.3.3, < 2.1)
+    slim-rails (2.0.1)
+      actionpack (>= 3.0, < 4.1)
+      activesupport (>= 3.0, < 4.1)
+      railties (>= 3.0, < 4.1)
+      slim (~> 2.0)
+    sprockets (2.10.0)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sprockets-rails (2.0.0)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      sprockets (~> 2.8)
     steak (2.0.0)
       capybara (>= 1.0.0)
       rspec-rails (>= 2.5.0)
-    temple (0.5.5)
-    thin (1.5.0)
+    temple (0.6.6)
+    thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
-    thor (0.16.0)
-    tilt (1.3.3)
-    tinymce-rails (3.5.8)
+    thor (0.18.1)
+    thread_safe (0.1.3)
+      atomic
+    tilt (1.4.1)
+    tinymce-rails (4.0.6)
       railties (>= 3.1.1)
-    treetop (1.4.12)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
-    warden (1.1.1)
+    tzinfo (0.3.37)
+    warden (1.2.3)
       rack (>= 1.0)
-    websocket (1.0.4)
-    xpath (1.0.0)
+    xpath (2.0.0)
       nokogiri (~> 1.3)
 
 PLATFORMS
@@ -235,12 +225,13 @@ DEPENDENCIES
   cmtool!
   coffee-script
   couch_potato!
-  devise (= 2.0.4)
+  devise
   devise_simply_stored
   email_validator
   factory_girl_rails
   haml-rails
   jquery-rails
+  orm_adapter!
   paperclip
   sass-rails
   simply_stored!
diff --git a/cmtool.gemspec b/cmtool.gemspec
index efb0e53..7bed86e 100644
--- a/cmtool.gemspec
+++ b/cmtool.gemspec
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib,vendor}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
   s.test_files = Dir["spec/**/*"]
 
-  s.add_dependency "rails", "~> 3.2.2"
+  s.add_dependency "rails", ">= 3.2.2"
   s.add_dependency 'email_validator'
   s.add_dependency 'bourbon'
   s.add_dependency 'haml-rails'
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'paperclip'
   s.add_dependency 'coffee-script'
   s.add_dependency "jquery-rails"
-  s.add_dependency 'devise', '2.0.4'
+  s.add_dependency 'devise'
   s.add_dependency 'devise_simply_stored'
 
   #s.add_development_dependency "sqlite3"