Simplify/fix travis build steps