Cleanup and getting ready for Travis