diff --git a/Gemfile b/Gemfile
index 66c89bcd..3fbcf475 100644
--- a/Gemfile
+++ b/Gemfile
@@ -135,7 +135,7 @@ group :test do
 
   # Guard for file monitoring
   gem 'rb-fsevent', '~> 0.9.0'
-  gem 'guard', '~> 1.0.0'
+  gem 'guard', '~> 1.0.3'
   gem 'guard-bundler', '~> 0.1.3'
   gem 'guard-cucumber', '~> 0.8.0'
   gem 'guard-rspec', '~> 0.7.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7348ef72..6f5215f6 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -49,21 +49,21 @@ GEM
       sass (>= 3.1)
     builder (3.0.4)
     cancan (1.6.7)
-    capybara (1.1.2)
+    capybara (1.1.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    capybara-webkit (0.12.0)
+    capybara-webkit (0.12.1)
       capybara (>= 1.0.0, < 1.2)
       json
     carrierwave (0.6.2)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
+    childprocess (0.9.0)
+      ffi (~> 1.0, >= 1.0.11)
     chronic (0.6.7)
     coderay (1.0.5)
     coffee-rails (3.2.2)
@@ -74,15 +74,16 @@ GEM
       execjs
     coffee-script-source (1.4.0)
     crack (0.3.1)
-    cucumber (1.2.0)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.10.0)
+      gherkin (~> 2.11.0)
       json (>= 1.4.6)
-    cucumber-rails (1.3.0)
+    cucumber-rails (1.3.1)
       capybara (>= 1.1.2)
-      cucumber (>= 1.1.8)
+      cucumber (>= 1.2.0)
       nokogiri (>= 1.5.0)
+      rails (~> 3.0)
     database_cleaner (0.7.1)
     devise (2.1.0)
       bcrypt-ruby (~> 3.0)
@@ -93,16 +94,16 @@ GEM
     draper (0.14.0)
       actionpack (~> 3.2)
       activesupport (~> 3.2)
-    em-websocket (0.3.6)
-      addressable (>= 2.1.1)
+    em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
     email_spec (1.2.1)
       mail (~> 2.2)
       rspec (~> 2.0)
     errship (2.2.0)
     erubis (2.7.0)
     escape (0.0.4)
-    eventmachine (0.12.10)
+    eventmachine (1.2.7)
     excon (0.13.4)
     execjs (1.4.0)
       multi_json (~> 1.0)
@@ -115,7 +116,7 @@ GEM
       multipart-post (~> 1.1)
     faraday_middleware (0.8.4)
       faraday (>= 0.7.4, < 0.9)
-    ffi (1.0.11)
+    ffi (1.9.25)
     fog (1.3.1)
       builder
       excon (~> 0.13.0)
@@ -131,8 +132,8 @@ GEM
       sass-rails (>= 3.1.1)
     formatador (0.2.3)
     geocoder (1.1.1)
-    gherkin (2.10.0)
-      json (>= 1.4.6)
+    gherkin (2.11.6)
+      json (>= 1.7.6)
     guard (1.0.3)
       ffi (>= 0.5.0)
       thor (>= 0.14.6)
@@ -142,13 +143,13 @@ GEM
     guard-cucumber (0.8.0)
       cucumber (>= 1.2.0)
       guard (>= 0.8.3)
-    guard-livereload (0.4.0)
+    guard-livereload (0.4.2)
       em-websocket (>= 0.2.0)
       guard (>= 0.10.0)
-      multi_json (~> 1.0.3)
+      multi_json (~> 1.0)
     guard-pow (0.2.1)
       guard (>= 0.3.0)
-    guard-rspec (0.7.0)
+    guard-rspec (0.7.3)
       guard (>= 0.10.0)
     guard-spork (0.8.0)
       guard (>= 0.10.0)
@@ -170,6 +171,7 @@ GEM
       excon (~> 0.13.3)
     high_voltage (1.1.1)
     hike (1.2.1)
+    http_parser.rb (0.6.0)
     i18n (0.6.1)
     journey (1.0.4)
     jquery-rails (2.2.0)
@@ -179,7 +181,7 @@ GEM
       jquery-rails
       railties (>= 3.1.0)
     jruby-pageant (1.0.2)
-    json (1.7.6)
+    json (1.8.6)
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -187,14 +189,12 @@ GEM
     km (1.1.2)
     launchy (2.1.0)
       addressable (~> 2.2.6)
-    libwebsocket (0.1.3)
-      addressable
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     method_source (0.7.0)
-    mime-types (1.20.1)
+    mime-types (1.25.1)
     multi_json (1.0.4)
     multipart-post (1.1.5)
     nested_form (0.3.1)
@@ -203,7 +203,7 @@ GEM
     net-ssh (2.4.0)
       jruby-pageant (>= 1.0.2)
     netrc (0.7.5)
-    nokogiri (1.5.2)
+    nokogiri (1.5.11)
     oauth2 (0.5.2)
       faraday (~> 0.7)
       multi_json (~> 1.0)
@@ -228,7 +228,7 @@ GEM
       pry (~> 0.9.6)
       slop (~> 2.1)
     psych (1.3.4)
-    rack (1.4.4)
+    rack (1.4.7)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-pjax (0.7.0)
@@ -236,7 +236,7 @@ GEM
       rack (~> 1.3)
     rack-ssl (1.3.3)
       rack
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (3.2.11)
       actionmailer (= 3.2.11)
@@ -295,19 +295,17 @@ GEM
       railties (>= 3.0)
       rspec (~> 2.10.0)
     ruby-hmac (0.4.0)
-    rubyzip (0.9.8)
+    rubyzip (1.2.1)
     safe_yaml (0.6.3)
     sass (3.2.5)
     sass-rails (3.2.6)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    selenium-webdriver (2.21.2)
-      childprocess (>= 0.2.5)
-      ffi (~> 1.0)
-      libwebsocket (~> 0.1.3)
-      multi_json (~> 1.0)
-      rubyzip
+    selenium-webdriver (2.53.4)
+      childprocess (~> 0.5)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0)
     sequel (3.20.0)
     simple_form (2.0.0.rc)
       actionpack (~> 3.0)
@@ -344,7 +342,7 @@ GEM
       rest-client (>= 1.4.0, < 1.7.0)
       sequel (~> 3.20.0)
       sinatra (~> 1.0.0)
-    thor (0.17.0)
+    thor (0.20.0)
     tilt (1.3.3)
     treetop (1.4.12)
       polyglot
@@ -363,6 +361,7 @@ GEM
     webmock (1.8.7)
       addressable (>= 2.2.7)
       crack (>= 0.1.7)
+    websocket (1.2.8)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -389,7 +388,7 @@ DEPENDENCIES
   faraday_middleware (~> 0.8.4)
   fog (~> 1.3.1)
   geocoder (~> 1.1.1)
-  guard (~> 1.0.0)
+  guard (~> 1.0.3)
   guard-bundler (~> 0.1.3)
   guard-cucumber (~> 0.8.0)
   guard-livereload (~> 0.4.0)
@@ -431,3 +430,6 @@ DEPENDENCIES
   unicorn
   vcr (~> 2.1.1)
   webmock (~> 1.8.7)
+
+BUNDLED WITH
+   1.16.1