.travis.yml in formtastic-2.3.0.rc3 vs .travis.yml in formtastic-2.3.0.rc4

@@ -1,56 +1,51 @@
+language: ruby
 before_install:
   - gem update --system
   - gem update bundler
 rvm:
   - 1.8.7
   - ree
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1
 gemfile:
   - gemfiles/rails_3.0.gemfile
   - gemfiles/rails_3.1.gemfile
   - gemfiles/rails_3.2.gemfile
+  - gemfiles/rails_4.gemfile
+  - gemfiles/rails_4.0.4.gemfile
+  - gemfiles/rails_edge.gemfile
 env:
   - DEFER_GC=false RAILS_EDGE=true
-script: "rake spec"
+script: "bundle exec rake spec"
 matrix:
-  include:
-    - rvm: 1.9.3
+  exclude:
+    - rvm: 1.8.7
       gemfile: gemfiles/rails_4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.0.0
+    - rvm: ree
       gemfile: gemfiles/rails_4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.1.0
+    - rvm: 1.9.2
       gemfile: gemfiles/rails_4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 1.9.3
+    - rvm: 1.8.7
       gemfile: gemfiles/rails_4.0.4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.0.0
+    - rvm: ree
       gemfile: gemfiles/rails_4.0.4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 1.9.3
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails_4.0.4.gemfile
+    - rvm: 1.8.7
       gemfile: gemfiles/rails_edge.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.0.0
+    - rvm: ree
       gemfile: gemfiles/rails_edge.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.1.0
+    - rvm: 1.9.2
       gemfile: gemfiles/rails_edge.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
   allow_failures:
     - 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.0
-      gemfile: gemfiles/rails_4.gemfile
-      env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 2.1.0
+    - rvm: 2.1
       gemfile: gemfiles/rails_edge.gemfile
       env: DEFER_GC=false RAILS_EDGE=true