Alright, just commiting this so (hopefully) TravisCI works...