Simplify travis some more...