Cleaning up Travis config and scripts