WIP yet more travis-ci work
WIP increase timeout