Cleanup and add travis