Updated travis build scripts (from rspec-dev)
Merge pull request #1511 from rspec/update-travis-build-scripts-2014-04-30-for-master

Updates from rspec-dev (2014-04-30)