Re-combine scripts into .travis.yml