Updated travis build scripts (from rspec-dev)
Merge pull request #1585 from rspec/update-travis-build-scripts-2014-06-06-for-master

Updates from rspec-dev (2014-06-06)