Fixing our Travis build

WIP