Update .travis.yml and fix a few minor issues