Clean up the .travis.yml a bit.
minor
Merge branch 'travis'