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

Updates from rspec-dev (2014-12-08)
Revert "Updated travis build scripts (from rspec-dev)"

This reverts commit f1b937bf7a6b8f09a26de7aeb230092ccbd2c3cd.

[ci skip]
Updated travis build scripts (from rspec-dev)