Fix and simplify travis setup.