Deal with travis and bundler issues.

- travis-ci/travis-ci#2220
- rubygems/bundler#3004

Author: myronmarston

travis/.travis.yml

@@ -1,4 +1,8 @@
-before_install: "script/clone_all_rspec_repos"
+before_install:
+  - "script/clone_all_rspec_repos"
+  # Downgrade bundler to work around https://github.com/bundler/bundler/issues/3004
+  - gem install bundler -v=1.5.3
+  - alias bundle="bundle _1.5.3_"
 bundler_args: "--binstubs --standalone --without documentation --path ../bundle"
 script: "script/run_build"
 rvm:
@@ -19,4 +23,6 @@ matrix:
     - rvm: jruby-head
     - rvm: ruby-head
     - rvm: rbx
+    # Until https://github.com/travis-ci/travis-ci/issues/2220 is fixed
+    - rvm: 2.1.0
   fast_finish: true