Tidy up travis build script