Update .travis.yml

Tidied up travis cfg.