WIP: merge into clean up travis