Merge branch 'master' into redis_metadata_storage

.travis.yml

@@ -1,12 +1,12 @@
 language: ruby
+cache: bundler
 rvm:
   - 2.2.4
 services:
   - redis-server
-sudo: required
-dist: trusty
 before_install:
   - sh .travis/install_riakcs.sh
+  - gem install bundler
 before_script:
   - cp config.yml.example config.yml
   - mkdir -p tmp && echo "swifttoken" > tmp/swift_token.txt
@@ -22,3 +22,6 @@ notifications:
       - http://hook-juggler.herokuapp.com/hooks/travis
     on_success: always
     on_failure: always
+# Force legacy Blue Box build for now
+sudo: required
+group: legacy