Revert travis config.
Merge pull request #670 from mperham/travis-config

Revert travis config.