FIXUP: travis-ci improvements