Cleanup, add travis yaml, fixed test failures