Clarify our timeouts

Fixes https://github.com/travis-ci/travis-ci/issues/2559
Merge branch 'gh-pages' of github.com:travis-ci/docs-travis-ci-com into gh-pages