Updated travis build scripts (from rspec-dev)
Merge pull request #1823 from rspec/update-travis-build-scripts-2014-12-29-for-master

Updates from rspec-dev (2014-12-29)