Simplify travis builds