Tidy up in travis.yml