Mirror changes to travis config on master branch.
Revert my mistake in pulling in these Rails 4 specific changes. We are not going to Rails for on 2-0-stable.
Merge pull request #128 from rterbush/revert

Revert Rails 4 specific changes I mistakenly included in previous commits to master branch