Merge branch 'master' into cd-v3-parity

Gemfile.lock

@@ -36,9 +36,9 @@ GIT
 
 GIT
   remote: git://github.com/rtomayko/rack-cache.git
-  revision: d00e6e491fcc7bdca9c27d735abde5c4fdb48cd9
+  revision: f96febebed7700337e8c362403b081e45b8e4f13
   specs:
-    rack-cache (1.2)
+    rack-cache (1.5.1)
       rack (>= 0.4)
 
 GIT
@@ -50,7 +50,7 @@ GIT
 
 GIT
   remote: git://github.com/travis-ci/travis-core.git
-  revision: 21793fc8b01f965b93cf98b7ab1458ee359a5a62
+  revision: 3c20e66a20d9d540e2a6c5fb70c542fe97c62e25
   specs:
     travis-core (0.0.1)
       actionmailer (~> 3.2.19)
@@ -145,7 +145,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    backports (3.6.6)
+    backports (3.6.7)
     builder (3.0.4)
     bunny (0.8.0)
     celluloid (0.16.0)
@@ -171,7 +171,7 @@ GEM
     erubis (2.7.0)
     factory_girl (2.4.2)
       activesupport
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.6)
     foreman (0.64.0)
@@ -187,7 +187,7 @@ GEM
     hashr (0.0.22)
     hike (1.2.3)
     hitimes (1.2.3)
-    httpclient (2.6.0.1)
+    httpclient (2.7.0.1)
     i18n (0.7.0)
     ice_nine (0.11.1)
     jemalloc (1.0.1)
@@ -225,10 +225,11 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pusher (0.14.5)
+    pusher (0.14.6)
       httpclient (~> 2.5)
       multi_json (~> 1.0)
-      signature (~> 0.1.8)
+      pusher-signature (~> 0.1.8)
+    pusher-signature (0.1.8)
     rack (1.4.7)
     rack-attack (4.2.0)
       rack
@@ -255,7 +256,7 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (2.3.0)
-    redis (3.2.1)
+    redis (3.2.2)
     redis-namespace (1.5.1)
       redis (~> 3.0, >= 3.0.4)
     rerun (0.8.2)
@@ -275,7 +276,6 @@ GEM
       json
       redis (>= 3.0.6)
       redis-namespace (>= 1.3.1)
-    signature (0.1.8)
     simple_states (1.0.1)
       activesupport
       hashr (~> 0.0.10)
@@ -315,7 +315,7 @@ GEM
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.44)
+    tzinfo (0.3.45)
     unicorn (4.8.3)
       kgio (~> 2.6)
       rack
@@ -369,3 +369,6 @@ DEPENDENCIES
   travis-yaml!
   unicorn
   yard-sinatra!
+
+BUNDLED WITH
+   1.10.6