Merge branch 'master' into ui_refactor

Gemfile

@@ -11,7 +11,7 @@ gem 'bushido'
 
 # Server/transport gems
 gem 'thin'
-gem 'bushido-faye'
+gem '_bushido-faye', '0.8.2'
 
 # Helper gems
 gem 'kaminari'

Gemfile.lock

@@ -12,6 +12,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
+    _bushido-faye (0.8.2)
+      _bushido-faye-websocket (>= 0.4.0)
+      cookiejar (>= 0.3.0)
+      em-http-request (>= 0.3.0)
+      eventmachine (>= 0.12.0)
+      rack (>= 1.0.0)
+      yajl-ruby (>= 1.0.0)
+    _bushido-faye-websocket (0.4.4)
+      eventmachine (>= 0.12.0)
     actionmailer (3.2.2)
       actionpack (= 3.2.2)
       mail (~> 2.4.0)
@@ -56,13 +65,6 @@ GEM
       json (>= 1.4.6)
       orm_adapter (~> 0.0.3)
       rest-client (>= 1.6.1)
-    bushido-faye (0.8.1)
-      cookiejar (>= 0.3.0)
-      em-http-request (>= 0.3.0)
-      eventmachine (>= 0.12.0)
-      faye-websocket (>= 0.4.0)
-      rack (>= 1.0.0)
-      yajl-ruby (>= 1.0.0)
     cocaine (0.2.1)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -100,8 +102,6 @@ GEM
     factory_girl_rails (1.7.0)
       factory_girl (~> 2.6.0)
       railties (>= 3.0.0)
-    faye-websocket (0.4.4)
-      eventmachine (>= 0.12.0)
     highline (1.6.11)
     hike (1.2.1)
     httparty (0.8.1)
@@ -210,10 +210,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  _bushido-faye (= 0.8.2)
   aws-sdk
   bourbon
   bushido
-  bushido-faye
   coffee-rails (~> 3.2.1)
   devise
   devise_bushido_authenticatable