WIP yet more travis-ci work