Tidy up travis configuration