Merge branch 'master' into stable

.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.1
+  - 2.2
 before_install:
   - sh .travis/install_riakcs.sh
 before_script:

Gemfile.lock

@@ -22,6 +22,7 @@ GEM
     backports (3.6.4)
     beefcake (0.3.7)
     builder (3.2.2)
+    certifi (2015.08.10)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
     excon (0.16.10)
@@ -59,7 +60,7 @@ GEM
     nokogiri (1.5.11)
     purdytest (2.0.0)
       minitest (~> 5.5)
-    rack (1.6.2)
+    rack (1.6.4)
     rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
@@ -76,7 +77,8 @@ GEM
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
     ruby-hmac (0.4.0)
-    sentry-raven (0.13.3)
+    sentry-raven (0.14.0)
+      certifi
       faraday (>= 0.7.6)
     sinatra (1.4.6)
       rack (~> 1.4)
@@ -118,3 +120,6 @@ DEPENDENCIES
   sentry-raven
   sinatra (~> 1.4)
   sinatra-contrib
+
+BUNDLED WITH
+   1.10.6