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

Updated travis build scripts (from rspec-dev)