Cleanup
Updates and travis!