More travis-ci fixes. Should be all good now