protect against missing conf
Merge branch 'master' of github.com:travis-ci/travis-core