diff --git a/.rvmrc b/.rvmrc
new file mode 100644
index 0000000000..45d71c7c88
--- /dev/null
+++ b/.rvmrc
@@ -0,0 +1 @@
+rvm 1.8.7-p302@teambox
diff --git a/Gemfile b/Gemfile
index 76e452b54f..b940473779 100644
--- a/Gemfile
+++ b/Gemfile
@@ -67,6 +67,6 @@ group :testing do
   gem 'factory_girl', '~> 1.3.2'
   gem 'pickle', '~> 0.4.4'
   gem 'cucumber-rails', '~> 0.3.2', :require => nil
-  gem 'capybara', '~> 0.4.0'
+  gem "capybara-webkit"
   gem 'launchy', '~> 0.3.7'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 849db48138..4a519d18d4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,11 +1,18 @@
 GIT
   remote: git://github.com/adamcooper/vestal_versions
-  revision: 6273df533f85014062e346cb1807b0531a809ee2
+  revision: 6273df5
   specs:
     vestal_versions (1.2.2)
       activerecord (>= 3.0.0)
       activesupport (>= 3.0.0)
 
+GIT
+  remote: git://github.com/mislav/will_paginate.git
+  revision: b1a5beeec9f56ecbe3594fcdca76d92b6767ce50
+  branch: rails3
+  specs:
+    will_paginate (3.0.pre3)
+
 GIT
   remote: git://github.com/teambox/activesupport-i18n-patch.git
   revision: 2e835783c0ea7062ad280b71b04060bd9b89e1a4
@@ -14,9 +21,9 @@ GIT
 
 GIT
   remote: git://github.com/teambox/choices.git
-  revision: 93d0cfb4e5fd4ae03b421b379a69ee00721f337b
+  revision: 675faa587554c08b0f060fc240974b33fcd3d24d
   specs:
-    choices (0.2.4)
+    choices (0.2.0)
       hashie (>= 0.4.0)
 
 GIT
@@ -26,12 +33,6 @@ GIT
     immortal (0.1.6)
       activerecord (~> 3.0.5)
 
-GIT
-  remote: git://github.com/teambox/will_paginate.git
-  revision: e69b364e79ce1fd24e3a10fcc87604969902f0a9
-  specs:
-    will_paginate (3.0.pre3)
-
 GIT
   remote: https://github.com/remi/rack-staticifier.git
   revision: 642ca9f4d8634270be031725077a748a1c8f6397
@@ -40,7 +41,7 @@ GIT
 
 GIT
   remote: https://github.com/teambox/trimmer.git
-  revision: 22a43334e7ea5483e1673e35c464bb787a9a5b77
+  revision: 3af71485b3b9475efa05eacfd4612172bba10efb
   specs:
     trimmer (0.0.1)
       i18n (>= 0.5.0)
@@ -54,14 +55,14 @@ GEM
       Platform (>= 0.4.0)
       open4
     Platform (0.4.0)
-    SystemTimer (1.2.3)
+    SystemTimer (1.2.1)
     abstract (1.0.0)
-    actionmailer (3.0.9)
-      actionpack (= 3.0.9)
-      mail (~> 2.2.19)
-    actionpack (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
+    actionmailer (3.0.6)
+      actionpack (= 3.0.6)
+      mail (~> 2.2.15)
+    actionpack (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
@@ -69,28 +70,30 @@ GEM
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.9)
-      activesupport (= 3.0.9)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-      arel (~> 2.0.10)
+    activerecord (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
+      arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.9)
-      activemodel (= 3.0.9)
-      activesupport (= 3.0.9)
-    activesupport (3.0.9)
-    addressable (2.2.6)
-    arel (2.0.10)
+    activeresource (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
+    activesupport (3.0.6)
+    addressable (2.2.5)
+    arel (2.0.9)
     aws-s3 (0.6.2)
       builder
       mime-types
       xml-simple
+    barista (1.0.0)
+      coffee-script (~> 2.1.1)
     builder (2.1.2)
     cancan (1.4.1)
-    capybara (0.4.1.2)
+    capybara (0.4.0)
       celerity (>= 0.7.9)
       culerity (>= 0.2.4)
       mime-types (>= 1.16)
@@ -98,60 +101,67 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
-    celerity (0.8.9)
+      xpath (~> 0.1.2)
+    celerity (0.8.6)
     cgi_multipart_eof_fix (2.5.0)
-    childprocess (0.1.9)
-      ffi (~> 1.0.6)
-    chronic (0.4.3)
+    childprocess (0.1.6)
+      ffi (~> 0.6.3)
+    chronic (0.3.0)
+    closure-compiler (1.1.1)
+    coffee-script (2.1.1)
+      coffee-script-source
+    coffee-script-source (1.0.0)
     columnize (0.3.2)
     configuration (1.2.0)
-    cucumber (0.10.6)
+    cucumber (0.10.0)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.0)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.3.2)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
-    culerity (0.2.15)
-    daemons (1.1.3)
+    culerity (0.2.13)
+    daemons (1.1.0)
     database_cleaner (0.5.2)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     eventmachine (0.12.10)
-    factory_girl (1.3.3)
+    factory_girl (1.3.2)
     faker (0.9.5)
       i18n (~> 0.4)
+    fakeweb (1.3.0)
     faraday (0.6.1)
       addressable (~> 2.2.4)
       multipart-post (~> 1.1.0)
       rack (< 2, >= 1.1.0)
     fastthread (1.0.7)
-    ffi (1.0.9)
-    fuubar (0.0.5)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    fuubar (0.0.3)
       rspec (~> 2.0)
       rspec-instafail (~> 0.1.4)
-      ruby-progressbar (~> 0.0.10)
+      ruby-progressbar (~> 0.0.9)
     gem_plugin (0.2.3)
-    gherkin (2.4.0)
-      json (>= 1.4.6)
-    haml (3.1.2)
-    hashie (1.0.0)
-    hpricot (0.8.4)
+    gherkin (2.3.3)
+      json (~> 1.4.6)
+    haml (3.0.25)
+    hashie (0.4.0)
+    hpricot (0.8.3)
     i18n (0.5.0)
-    icalendar (1.1.6)
-    jammit (0.6.3)
-      yui-compressor (>= 0.9.3)
-    json (1.5.1)
-    json_pure (1.5.1)
+    icalendar (1.1.5)
+    jammit (0.6.0)
+      closure-compiler (>= 0.1.0)
+      yui-compressor (>= 0.9.1)
+    json (1.4.6)
+    json_pure (1.4.6)
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
     libxml-ruby (1.1.3)
     linecache (0.43)
-    mail (2.2.19)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -164,7 +174,7 @@ GEM
       fastthread (>= 1.0.1)
       gem_plugin (>= 0.2.3)
     multi_json (0.0.5)
-    multipart-post (1.1.2)
+    multipart-post (1.1.0)
     mysql (2.8.1)
     nokogiri (1.4.4)
     oa-core (0.2.3)
@@ -181,39 +191,39 @@ GEM
       faraday (~> 0.6.0)
       multi_json (~> 0.0.4)
     open4 (1.0.1)
-    paperclip (2.3.11)
-      activerecord (>= 2.3.0)
-      activesupport (>= 2.3.2)
+    paperclip (2.3.8)
+      activerecord
+      activesupport
     pg (0.9.0)
-    pickle (0.4.7)
+    pickle (0.4.4)
       cucumber (>= 0.8)
       rake
+      rspec (>= 1.3)
+      yard
     polyglot (0.3.1)
-    rack (1.2.3)
+    rack (1.2.2)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
-    rack-ssl-enforcer (0.2.2)
+    rack-ssl-enforcer (0.2.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.9)
-      actionmailer (= 3.0.9)
-      actionpack (= 3.0.9)
-      activerecord (= 3.0.9)
-      activeresource (= 3.0.9)
-      activesupport (= 3.0.9)
+    rails (3.0.6)
+      actionmailer (= 3.0.6)
+      actionpack (= 3.0.6)
+      activerecord (= 3.0.6)
+      activeresource (= 3.0.6)
+      activesupport (= 3.0.6)
       bundler (~> 1.0)
-      railties (= 3.0.9)
-    railties (3.0.9)
-      actionpack (= 3.0.9)
-      activesupport (= 3.0.9)
+      railties (= 3.0.6)
+    railties (3.0.6)
+      actionpack (= 3.0.6)
+      activesupport (= 3.0.6)
       rake (>= 0.8.7)
-      rdoc (~> 3.4)
       thor (~> 0.14.4)
-    rake (0.9.2)
+    rake (0.8.7)
     rcov (0.9.9)
-    rdiscount (1.6.8)
-    rdoc (3.6.1)
-    riddle (1.3.3)
+    rdiscount (1.6.5)
+    riddle (1.2.2)
     rspec (2.3.0)
       rspec-core (~> 2.3.0)
       rspec-expectations (~> 2.3.0)
@@ -221,7 +231,7 @@ GEM
     rspec-core (2.3.1)
     rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
-    rspec-instafail (0.1.8)
+    rspec-instafail (0.1.5)
     rspec-mocks (2.3.0)
     rspec-rails (2.3.1)
       actionpack (~> 3.0)
@@ -233,12 +243,11 @@ GEM
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    ruby-progressbar (0.0.10)
+    ruby-progressbar (0.0.9)
     rubyzip (0.9.4)
-    sass (3.1.2)
-    selenium-webdriver (0.2.1)
-      childprocess (>= 0.1.7)
-      ffi (>= 1.0.7)
+    selenium-webdriver (0.1.2)
+      childprocess (~> 0.1.5)
+      ffi (~> 0.6.3)
       json_pure
       rubyzip
     sprockets (1.0.2)
@@ -249,8 +258,8 @@ GEM
     term-ansicolor (1.0.5)
     text-format (1.0.0)
       text-hyphen (~> 1.0.0)
-    text-hyphen (1.0.2)
-    thin (1.2.11)
+    text-hyphen (1.0.0)
+    thin (1.2.7)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
@@ -263,16 +272,19 @@ GEM
     tmail (1.2.7.1)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.28)
-    webrat (0.7.3)
+    tzinfo (0.3.26)
+    vcr (1.9.0)
+    vcr-remote-controller (0.1.0)
+    webrat (0.7.2)
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
     whenever (0.4.2)
       chronic (>= 0.2.3)
-    xml-simple (1.0.16)
-    xpath (0.1.4)
+    xml-simple (1.0.12)
+    xpath (0.1.2)
       nokogiri (~> 1.3)
+    yard (0.6.4)
     yui-compressor (0.9.6)
       POpen4 (>= 0.1.4)
 
@@ -283,6 +295,7 @@ DEPENDENCIES
   SystemTimer (~> 1.2.0)
   activesupport-i18n-patch!
   aws-s3 (~> 0.6.2)
+  barista (~> 1.0)
   builder (~> 2.1.2)
   cancan (~> 1.4.1)
   capybara (~> 0.4.0)
@@ -291,8 +304,9 @@ DEPENDENCIES
   database_cleaner (~> 0.5.0)
   factory_girl (~> 1.3.2)
   faker
+  fakeweb (~> 1.3.0)
   fuubar
-  haml (~> 3.1.2)
+  haml (~> 3.0.0.beta1)
   hashie
   hpricot (~> 0.8.2)
   i18n (>= 0.1.3)
@@ -312,12 +326,11 @@ DEPENDENCIES
   pickle (~> 0.4.4)
   rack-ssl-enforcer
   rack-staticifier!
-  rails (~> 3.0.9)
+  rails (~> 3.0.3)
   rcov
   rdiscount (~> 1.6.3)
   rspec-rails (~> 2.3.1)
   ruby-debug (~> 0.10.3)
-  sass (~> 3.1.2)
   sprockets-rails (~> 0.0.1)
   sqlite3-ruby (~> 1.2.5)
   teambox-permalink_fu
@@ -329,6 +342,8 @@ DEPENDENCIES
   tmail (~> 1.2.3)
   trimmer!
   tzinfo (~> 0.3.12)
+  vcr (~> 1.9.0)
+  vcr-remote-controller
   vestal_versions (~> 1.2.2)!
   webrat
   whenever (~> 0.4.1)
diff --git a/features/support/env.rb b/features/support/env.rb
index 858c4ddb44..c49937c927 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -40,6 +40,7 @@
 
 Cucumber::Rails::World.use_transactional_fixtures = true
 
+Capybara.javascript_driver = :webkit
 #Capybara.register_driver :selenium do |app|
   #Capybara::Driver::Selenium
   ##profile = Selenium::WebDriver::Firefox::Profile.new