diff --git a/Gemfile b/Gemfile
index ef35abc6ec12831ce8628329c27ce5e36ed60b75..882f14c92a68501425e35996652917e1665db892 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'rails', '>= 3.0.0'
 
 gem 'bundler', '>= 1.0.0'
-#gem "chef"
+gem "chef", :require => false
 
 #Security
 gem 'devise', '1.1.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 3a49763834611077628e21eadcc3b7f70d23af83..bd4190fe3cabe5b1613c5abf6cd06dc1d46a0ed3 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/Empact/roxml.git
-  revision: d411519add92e0cd5a985253f376d25c26884324
+  revision: 7ea9a9ffd2338aaef5b04cb792060ae8c98f346a
   specs:
     roxml (3.1.6)
       activesupport (>= 2.3.0)
@@ -39,7 +39,7 @@ GIT
 
 GIT
   remote: git://github.com/jnunemaker/mongomapper.git
-  revision: fd59b0ab068be7321f8e84b9dc12fb4fa6b8535d
+  revision: b24db29c236f239d6a5a821fb6a444430e89f9d6
   branch: rails3
   specs:
     mongo_mapper (0.8.4)
@@ -117,6 +117,7 @@ GEM
     bson (1.1)
     bson_ext (1.1)
     builder (2.1.2)
+    bunny (0.6.0)
     capistrano (2.5.19)
       highline
       net-scp (>= 1.0.0)
@@ -131,6 +132,20 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.3)
     cgi_multipart_eof_fix (2.5.0)
+    chef (0.9.12)
+      bunny (>= 0.6.0)
+      erubis
+      extlib
+      highline
+      json (>= 1.4.4, <= 1.4.6)
+      mixlib-authentication (>= 1.1.0)
+      mixlib-cli (>= 1.1.0)
+      mixlib-config (>= 1.1.2)
+      mixlib-log (>= 1.2.0)
+      moneta
+      ohai (>= 0.5.7)
+      rest-client (>= 1.0.4, < 1.7.0)
+      uuidtools
     childprocess (0.1.3)
       ffi (~> 0.6.3)
     columnize (0.3.1)
@@ -150,7 +165,7 @@ GEM
     devise (1.1.3)
       bcrypt-ruby (~> 2.1.2)
       warden (~> 0.10.7)
-    devise_invitable (0.3.4)
+    devise_invitable (0.3.5)
       devise (~> 1.1.0)
     diff-lcs (1.1.2)
     em-websocket (0.1.4)
@@ -159,6 +174,7 @@ GEM
     erubis (2.6.6)
       abstract (>= 1.0.0)
     eventmachine (0.12.10)
+    extlib (0.9.15)
     factory_girl (1.3.2)
     factory_girl_rails (1.0)
       factory_girl (~> 1.3)
@@ -174,7 +190,7 @@ GEM
     gherkin (2.2.9)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
-    haml (3.0.22)
+    haml (3.0.23)
     hashie (0.4.0)
     highline (1.6.1)
     http_connection (1.4.0)
@@ -193,13 +209,19 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    mini_fb (1.1.3)
+    mini_fb (1.1.4)
       hashie
       rest-client
     mini_magick (3.0)
       subexec (~> 0.0.4)
+    mixlib-authentication (1.1.4)
+      mixlib-log
+    mixlib-cli (1.2.0)
+    mixlib-config (1.1.2)
+    mixlib-log (1.2.0)
     mocha (0.9.9)
       rake
+    moneta (0.6.0)
     mongo (1.1)
       bson (>= 1.0.5)
     mongrel (1.1.5)
@@ -241,10 +263,17 @@ GEM
       oa-core (= 0.1.6)
       rack-openid (~> 1.2.0)
       ruby-openid-apps-discovery
-    oauth (0.4.3)
+    oauth (0.4.4)
     oauth2 (0.1.0)
       faraday (~> 0.5.0)
       multi_json (~> 0.0.4)
+    ohai (0.5.8)
+      extlib
+      json (>= 1.4.4, <= 1.4.6)
+      mixlib-cli
+      mixlib-config
+      mixlib-log
+      systemu
     omniauth (0.1.6)
       oa-basic (= 0.1.6)
       oa-core (= 0.1.6)
@@ -313,6 +342,7 @@ GEM
       json_pure
       rubyzip
     subexec (0.0.4)
+    systemu (1.2.0)
     term-ansicolor (1.0.5)
     thin (1.2.7)
       daemons (>= 1.0.9)
@@ -330,7 +360,7 @@ GEM
     uuidtools (2.1.1)
     warden (0.10.7)
       rack (>= 1.0.0)
-    webmock (1.4.0)
+    webmock (1.5.0)
       addressable (>= 2.2.2)
       crack (>= 0.1.7)
     will_paginate (3.0.pre2)
@@ -347,6 +377,7 @@ DEPENDENCIES
   bundler (>= 1.0.0)
   capybara (~> 0.3.9)
   carrierwave!
+  chef
   cucumber-rails (= 0.3.2)
   database_cleaner (= 0.5.2)
   devise (= 1.1.3)