.travis.yml in formtastic-2.2.1 vs .travis.yml in formtastic-2.3.0.rc

@@ -1,26 +1,30 @@
-before_install: gem update --system
+before_install: 
+  - gem update --system
+  - gem update bundler
 rvm:
   - 1.8.7
   - ree
   - 1.9.2
   - 1.9.3
 gemfile:
-  - gemfiles/rails-3.0.gemfile
-  - gemfiles/rails-3.1.gemfile
-  - gemfiles/rails-3.2.gemfile
-  - gemfiles/rails-4.gemfile
+  - gemfiles/rails_3.0.gemfile
+  - gemfiles/rails_3.1.gemfile
+  - gemfiles/rails_3.2.gemfile
 env:
   - DEFER_GC=false RAILS_EDGE=true
 script: "rake spec"
 matrix:
-  exclude:
-    - rvm: 1.8.7
-      gemfile: gemfiles/rails-4.gemfile
+  include:
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_4.gemfile
       env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: ree
-      gemfile: gemfiles/rails-4.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/rails_4.gemfile
       env: DEFER_GC=false RAILS_EDGE=true
-    - rvm: 1.9.2
-      gemfile: gemfiles/rails-4.gemfile
+  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