I apologize for all my travis commits, there is probably a better way...