Misc cleanup
Update .travis.yml