Some tidy up of the travis.yml.