Merge branch 'master' into ui_work

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'
@@ -31,7 +31,7 @@ group :assets do
   gem 'uglifier', '>= 1.0.3'
 end
 
-gem 'tane', :path => "../tane", :group => :development
+# gem 'tane', :path => "../tane", :group => :development
 
 # Test gems, obviously
 group :test do

Gemfile.lock

@@ -1,17 +1,15 @@
-PATH
-  remote: ../tane
-  specs:
-    tane (0.0.3)
-      awesome_print
-      erubis
-      highline
-      launchy
-      rake
-      rest-client
-
 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)
@@ -41,7 +39,6 @@ GEM
       multi_json (~> 1.0)
     addressable (2.2.7)
     arel (3.0.2)
-    awesome_print (1.0.2)
     aws-sdk (1.3.8)
       httparty (~> 0.7)
       json (~> 1.4)
@@ -56,13 +53,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 +90,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)
@@ -117,8 +105,6 @@ GEM
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
       railties (>= 3.0.0)
-    launchy (2.1.0)
-      addressable (~> 2.2.6)
     mail (2.4.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -210,10 +196,10 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  _bushido-faye (= 0.8.2)
   aws-sdk
   bourbon
   bushido
-  bushido-faye
   coffee-rails (~> 3.2.1)
   devise
   devise_bushido_authenticatable
@@ -229,6 +215,5 @@ DEPENDENCIES
   sass-rails (~> 3.2.3)
   shoulda-matchers
   sqlite3
-  tane!
   thin
   uglifier (>= 1.0.3)