Whilst at it, clean up travis yml file.