Further Travis CI tweaks.