updating part2, far from finished

Gemfile.lock

@@ -99,8 +99,9 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.3.9)
-      ffi (~> 1.0, >= 1.0.11)
+    capybara-webkit (1.1.0)
+      capybara (~> 2.0, >= 2.0.2)
+      json
     chunky_png (1.2.9)
     climate_control (0.0.3)
       activesupport (>= 3.0)
@@ -182,20 +183,19 @@ GEM
     faye-websocket (0.7.1)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.3.1)
-    ffi (1.9.3)
     fssm (0.2.10)
-    fuubar (1.3.0)
+    fuubar (1.3.2)
       rspec (>= 2.14.0, < 3.1.0)
       ruby-progressbar (~> 1.3)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     haml (4.0.4)
       tilt
-    haml-rails (0.5.2)
-      actionpack (~> 4.0.1)
-      activesupport (~> 4.0.1)
+    haml-rails (0.5.3)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
       haml (>= 3.1, < 5.0)
-      railties (~> 4.0.1)
+      railties (>= 4.0.1)
     handlebars-source (1.1.2)
     hashie (2.0.5)
     hike (1.2.3)
@@ -277,7 +277,7 @@ GEM
       activesupport (= 4.0.2)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.1.0)
+    rake (10.1.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rqrcode (0.4.2)
@@ -297,17 +297,11 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     ruby-progressbar (1.3.2)
-    rubyzip (1.1.0)
-    sass (3.2.12)
+    sass (3.2.13)
     sass-rails (4.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (>= 3.1.10)
       sprockets-rails (~> 2.0.0)
-    selenium-webdriver (2.38.0)
-      childprocess (>= 0.2.5)
-      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0.4)
     simple_form (3.0.1)
       actionpack (>= 4.0.0, < 4.1)
       activemodel (>= 4.0.0, < 4.1)
@@ -348,12 +342,11 @@ GEM
       gherkin (>= 2.5)
       rspec (~> 2.0)
     tzinfo (0.3.38)
-    uglifier (2.3.3)
+    uglifier (2.4.0)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     warden (1.2.3)
       rack (>= 1.0)
-    websocket (1.0.7)
     websocket-driver (0.3.1)
     xpath (2.0.0)
       nokogiri (~> 1.3)
@@ -366,6 +359,7 @@ DEPENDENCIES
   bootstrap-sass (~> 2.3.2.2)
   bourbon
   capybara
+  capybara-webkit
   cmtool!
   coffee-rails
   compass-rails
@@ -395,7 +389,6 @@ DEPENDENCIES
   rqrcode
   rspec-rails
   sass-rails
-  selenium-webdriver
   simple_form
   simply_stored!
   slim-rails