simplify travis setup
tweak travis