Tidied up .travis.yml