Added support to configure webhook_timeout in gitlab.yaml
Fixed default comments to make it clearer
Merge branch 'master' of https://github.com/wesgurn/gitlabhq

Conflicts:
	config/gitlab.yml.example
Merge branch 'master' of https://github.com/wesgurn/gitlabhq

Conflicts:
	config/gitlab.yml.example