Updated travis build scripts (from rspec-dev)
Merge pull request #834 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 addf8949b9e263fe2dcd526ec4715a736fdf9b7d.

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