Update and fix travis.yml