allow for resolv updates to be disabled
Merge branch 'master' of https://github.com/travis-ci/travis-build