Misc. .travis.yml fixes

See commit messages.