Simplify and fix travis config