Small env tweaks for travis.yml and scripts