simplify travis setup
fix build breakage