Simplify and fix Travis script