WIP: Take 2 at making travis happy