Synchronize .travis.yml
Update Gemfile for .travis.yml defaults
Merge pull request #533 from cmurphy/master

Synchronize .travis.yml