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

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