diff --git a/.travis.yml b/.travis.yml
index c4fea95135..37acfc02ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,26 @@
+sudo: false
 language: node_js
 git:
   depth: 10
 node_js:
   - "0.12"
 before_install:
-  - travis_retry sudo pip install -r test-infra/requirements.txt
-  - rvm use 1.9.3 --fuzzy
+  - travis_retry pip install -r test-infra/requirements.txt --user
+  - rvm install 2.0.0 && rvm use 2.0.0
   - export GEMDIR=$(rvm gemdir)
-  - if [ "$TWBS_TEST" = validate-html ]; then echo "ruby=$(basename $GEMDIR) jekyll=$JEKYLL_VERSION rouge=$ROUGE_VERSION" > pseudo_Gemfile.lock; fi
   - "export TRAVIS_COMMIT_MSG=\"$(git log --format=%B --no-merges -n 1)\""
   - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip validator\]'; export TWBS_DO_VALIDATOR=$?; true
   - echo "$TRAVIS_COMMIT_MSG" | grep '\[skip sauce\]'; export TWBS_DO_SAUCE=$?; true
   - if [ "$TRAVIS_REPO_SLUG" = twbs-savage/bootstrap ]; then export TWBS_DO_VALIDATOR=0; fi
 install:
+  - bundle install --deployment --jobs=3
+  - gem install scss_lint --no-rdoc --no-ri
   - npm install -g grunt-cli
-  - ./test-infra/s3_cache.py download npm-modules
-  - if [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py download rubygems; fi
-after_script:
-  - if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ] && [ "$TWBS_TEST" = core ]; then ./test-infra/s3_cache.py upload npm-modules; fi
-  - if [ "$TRAVIS_REPO_SLUG" != twbs-savage/bootstrap ] && [ "$TWBS_TEST" = validate-html ] && [ $TWBS_DO_VALIDATOR -ne 0 ]; then ./test-infra/s3_cache.py upload rubygems; fi
+  - npm install
+cache:
+  directories:
+    - node_modules
+    - vendor/bundle
 env:
   global:
     - JEKYLL_VERSION="2.5.3"
diff --git a/Gemfile b/Gemfile
index cc3e50b7f4..adfacbc160 100644
--- a/Gemfile
+++ b/Gemfile
@@ -5,8 +5,8 @@ source 'https://rubygems.org'
 
 group :development, :test do
   gem 'jekyll', '~> 2.5.2'
+  gem 'jekyll-redirect-from', '~> 0.8.0'
   gem 'rouge', '~> 1.7.4'
   gem 'sass', '~> 3.4.9'
   gem 'scss-lint', '~> 0.31'
-  gem 'jekyll-redirect-from', '~> 0.8.0'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 725379399c..63b3f42c7f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -34,6 +34,8 @@ GEM
       coffee-script (~> 2.2)
     jekyll-gist (1.1.0)
     jekyll-paginate (1.1.0)
+    jekyll-redirect-from (0.8.0)
+      jekyll (>= 2.0)
     jekyll-sass-converter (1.3.0)
       sass (~> 3.2)
     jekyll-watch (1.2.0)
@@ -73,6 +75,10 @@ PLATFORMS
 
 DEPENDENCIES
   jekyll (~> 2.5.2)
+  jekyll-redirect-from (~> 0.8.0)
   rouge (~> 1.7.4)
   sass (~> 3.4.9)
   scss-lint (~> 0.31)
+
+BUNDLED WITH
+   1.10.5