Updated travis build scripts (from rspec-dev)
Merge pull request #1674 from rspec/update-travis-build-scripts-2014-08-21-for-master

Updates from rspec-dev (2014-08-21)