deal with unknown keys better
Merge branch 'master' of https://github.com/travis-ci/travis