Clean up travis build scripts a little.