We do not like configuration options.
 Merge branch 'we-hate-options' into 'master'

We Hate Options
Merge branch 'master' of github.com:gitlabhq/gitlabhq