Fix travis build script messing with resolv.conf
Merge branch 'master' of github.com:DanielG/travis-run