More simplification in the Travis CI scripts (does this work?)