Tidied up travis.yml