diff --git a/Gemfile b/Gemfile
index baf98f57..3295b1f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,12 +4,16 @@ source 'http://rubygems.org'
 gem 'rails', '3.0.0.rc'
 
 gem 'liquid', '2.0.0'
+# i think we'll need to fork our templating language
+# gem 'locomotive-liquid'
+
 gem 'bson_ext', '>= 1.0.1'
-gem 'mongoid', "2.0.0.beta.15"
+gem 'mongoid', :git => "git://github.com/durran/mongoid.git"
 gem 'mongoid_acts_as_tree', '0.1.5'
 gem 'mongo_session_store', '2.0.0.pre'
 gem 'warden'
-gem 'devise', '1.1.rc2'
+# gem 'devise', '1.1.rc2'
+gem 'devise', :git => "git://github.com/plataformatec/devise.git"
 gem 'haml', '3.0.13'
 gem 'rmagick', '2.12.2'
 gem 'aws'
@@ -29,7 +33,6 @@ group :development do
   gem 'mongrel'
   gem 'cgi_multipart_eof_fix'
   gem 'fastthread'
-  # gem 'mongrel_experimental'
 end
 
 group :test, :development do
@@ -38,7 +41,7 @@ end
 
 group :test do
   gem "autotest"
-  gem 'rspec-rails', '2.0.0.beta.18'
+  gem 'rspec-rails', '2.0.0.beta.19'
   gem 'factory_girl_rails'
   gem 'capybara'
   gem "capybara-envjs", ">= 0.1.5"
diff --git a/Gemfile.lock b/Gemfile.lock
index 93ea47d0..a7c594d6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,14 @@
+GIT
+  remote: git://github.com/durran/mongoid.git
+  revision: 8f38586
+  specs:
+    mongoid (2.0.0.beta.14)
+      activemodel (= 3.0.0.rc)
+      bson (= 1.0.4)
+      mongo (= 1.0.6)
+      tzinfo (= 0.3.22)
+      will_paginate (~> 3.0.pre)
+
 GIT
   remote: git://github.com/floehopper/mocha.git
   revision: d1715ff
@@ -5,6 +16,14 @@ GIT
     mocha (0.9.8.20090918115329)
       rake
 
+GIT
+  remote: git://github.com/plataformatec/devise.git
+  revision: c31b1f2
+  specs:
+    devise (1.2.0)
+      bcrypt-ruby (~> 2.1.2)
+      warden (~> 0.10.7)
+
 GIT
   remote: http://github.com/justinfrench/formtastic.git
   revision: 4481341
@@ -85,9 +104,6 @@ GEM
     culerity (0.2.10)
     daemons (1.1.0)
     database_cleaner (0.5.2)
-    devise (1.1.rc2)
-      bcrypt-ruby (~> 2.1.2)
-      warden (~> 0.10.7)
     diff-lcs (1.1.2)
     envjs (0.3.7)
       johnson (>= 2.0.0.pre3)
@@ -140,12 +156,6 @@ GEM
       bson (>= 1.0.4)
     mongo_session_store (2.0.0.pre)
       actionpack (~> 3.0)
-    mongoid (2.0.0.beta.15)
-      activemodel (= 3.0.0.rc)
-      bson (= 1.0.4)
-      mongo (= 1.0.6)
-      tzinfo (= 0.3.22)
-      will_paginate (~> 3.0.pre)
     mongoid_acts_as_tree (0.1.5)
       bson (>= 0.20.1)
       mongoid (<= 2.0.0)
@@ -187,9 +197,9 @@ GEM
     rspec-expectations (2.0.0.beta.19)
       diff-lcs (>= 1.1.2)
     rspec-mocks (2.0.0.beta.19)
-    rspec-rails (2.0.0.beta.18)
-      rspec (>= 2.0.0.beta.14)
-      webrat (>= 0.7.0)
+    rspec-rails (2.0.0.beta.19)
+      rspec (= 2.0.0.beta.19)
+      webrat (>= 0.7.2.beta.1)
     ruby-debug (0.10.3)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.3.0)
@@ -213,7 +223,7 @@ GEM
     uuidtools (2.1.1)
     warden (0.10.7)
       rack (>= 1.0.0)
-    webrat (0.7.1)
+    webrat (0.7.2.beta.1)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
@@ -236,7 +246,7 @@ DEPENDENCIES
   cucumber
   cucumber-rails
   database_cleaner
-  devise (= 1.1.rc2)
+  devise!
   factory_girl_rails
   fastthread
   formtastic!
@@ -250,12 +260,12 @@ DEPENDENCIES
   mimetype-fu
   mocha!
   mongo_session_store (= 2.0.0.pre)
-  mongoid (= 2.0.0.beta.15)
+  mongoid!
   mongoid_acts_as_tree (= 0.1.5)
   mongrel
   rails (= 3.0.0.rc)
   rmagick (= 2.12.2)
-  rspec-rails (= 2.0.0.beta.18)
+  rspec-rails (= 2.0.0.beta.19)
   ruby-debug
   spork
   warden
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb
index a051cd37..2c67a1d9 100644
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -121,12 +121,6 @@ Devise.setup do |config|
   # are using only default views.
   config.scoped_views = true
 
-  # By default, devise detects the role accessed based on the url. So whenever
-  # accessing "/users/sign_in", it knows you are accessing an User. This makes
-  # routes as "/sign_in" not possible, unless you tell Devise to use the default
-  # scope, setting true below.
-  config.use_default_scope = true
-
   # Configure the default scope used by Devise. By default it's the first devise
   # role declared in your routes.
   config.default_scope = :account