clean up config to use global settings
globals now implemented and documented
Merge branch 'master' of github.com:discourse/discourse
correct defaults