Clean up project
Fix Travis