Merge pull request #80 from jasnow/master

Upgraded 5 gems by rebuilding Gemfile.lock file

Gemfile.lock

@@ -117,8 +117,8 @@ GEM
       em-websocket (~> 0.5)
       guard (~> 2.0)
       multi_json (~> 1.8)
-    guard-rspec (4.2.0)
-      guard (>= 2.1.1)
+    guard-rspec (4.2.3)
+      guard (~> 2.1)
       rspec (>= 2.14, < 4.0)
     guard-shell (0.6.0)
       guard (>= 1.1.0)
@@ -205,7 +205,7 @@ GEM
       thor (>= 0.14.6, < 2.0)
     raindrops (0.12.0)
     rake (10.1.1)
-    rb-fsevent (0.9.3)
+    rb-fsevent (0.9.4)
     rb-inotify (0.9.3)
       ffi (>= 0.5.0)
     rdoc (3.12.2)
@@ -219,8 +219,9 @@ GEM
     rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
-    rspec-rails (2.14.0)
+    rspec-rails (2.14.1)
       actionpack (>= 3.0)
+      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-core (~> 2.14.0)
@@ -286,7 +287,7 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    websocket-driver (0.3.1)
+    websocket-driver (0.3.2)
     xpath (2.0.0)
       nokogiri (~> 1.3)