.travis.yml in formtastic-3.1.3 vs .travis.yml in formtastic-3.1.4

@@ -1,29 +1,31 @@
+sudo: false
+cache: bundler
 language: ruby
-before_install:
-  - gem update --system
-  - gem update bundler
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
 gemfile:
   - gemfiles/rails_3.2.gemfile
   - gemfiles/rails_4.gemfile
   - gemfiles/rails_4.0.4.gemfile
   - gemfiles/rails_4.1.gemfile
   - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_edge.gemfile
 env:
-  - DEFER_GC=false RAILS_EDGE=true
+before_install:
+  - gem install bundler --version 1.11.2
 script: "bundle exec rake spec"
 matrix:
-  allow_failures:
+  exclude:
     - rvm: 1.9.3
       gemfile: gemfiles/rails_edge.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
     - rvm: 2.0.0
       gemfile: gemfiles/rails_edge.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.1
+    - rvm: 2.1.8
       gemfile: gemfiles/rails_edge.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
+  allow_failures:
+    - gemfile: gemfiles/rails_edge.gemfile
+    - rvm: 1.9.3