upgrade fog

stop using our fork and instead use upstream

Gemfile

@@ -18,7 +18,7 @@ gem 'multi_json',       '~> 1.2.0'
 gem 'json'
 gem 'coder'
 
-gem 'fog',                  git: 'http://github.com/travis-ci/fog'
+gem 'fog'
 gem 'travis-saucelabs-api', '~> 0.0'
 gem 'docker-api'
 

Gemfile.lock

@@ -1,18 +1,3 @@
-GIT
-  remote: http://github.com/travis-ci/fog
-  revision: 34e03180370abdd61903bbc5cb3564e54bd1eec1
-  specs:
-    fog (1.10.1)
-      builder
-      excon (~> 0.20)
-      formatador (~> 0.2.0)
-      json (~> 1.7)
-      mime-types
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5.0)
-      ruby-hmac
-
 GIT
   remote: https://github.com/celluloid/celluloid
   revision: 5a560561b49241fc84c3b414bb6652826ce8ea71
@@ -29,7 +14,7 @@ GIT
 
 GIT
   remote: https://github.com/travis-ci/travis-build
-  revision: 5bff20d401900b751c885bc6c4d0b955b0b4149f
+  revision: b9f0a38a4078dffc498cd138db0ca38bbfe2762e
   specs:
     travis-build (0.0.1)
 
@@ -43,7 +28,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.18)
+    activesupport (3.2.19)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.6)
@@ -55,7 +40,7 @@ GEM
     coderay (1.1.0)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    docker-api (1.12.0)
+    docker-api (1.13.0)
       archive-tar-minitar
       excon (>= 0.37.0)
       json
@@ -67,10 +52,31 @@ GEM
     faraday_middleware (0.9.1)
       faraday (>= 0.7.4, < 0.10)
     ffi (1.9.3-java)
+    fog (1.22.1)
+      fog-brightbox
+      fog-core (~> 1.22)
+      fog-json
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-brightbox (0.1.1)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto
+    fog-core (1.22.0)
+      builder
+      excon (~> 0.33)
+      formatador (~> 0.2)
+      mime-types
+      net-scp (~> 1.1)
+      net-ssh (>= 2.1.3)
+    fog-json (1.0.0)
+      multi_json (~> 1.0)
     formatador (0.2.5)
     hashr (0.0.22)
     hitimes (1.2.1-java)
     i18n (0.6.9)
+    inflecto (0.0.2)
+    ipaddress (0.8.0)
     json (1.8.1-java)
     march_hare (2.2.0-java)
     metaclass (0.0.4)
@@ -87,7 +93,7 @@ GEM
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
-    nokogiri (1.5.11-java)
+    nokogiri (1.6.2.1-java)
     pry (0.10.0-java)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -107,7 +113,6 @@ GEM
     rspec-mocks (3.0.2)
       rspec-support (~> 3.0.0)
     rspec-support (3.0.2)
-    ruby-hmac (0.4.0)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -133,7 +138,7 @@ DEPENDENCIES
   coder
   docker-api
   faraday (~> 0.7.5)
-  fog!
+  fog
   hashr (~> 0.0.18)
   json
   march_hare (= 2.2.0)