Clean up config-template.py

Except for making BOT_ASYNC True by default (I believe it is no
longer experimental, I have been running it without issue in
production for over 6 months), this doesn't change any
configuration items. It only orders and groups items in a way that
makes the most sense, and changes the commenting around options to
be mostly consistent.
Fix a whitespace issue in config-template
Merge pull request #153 from zoni/config

Clean up config-template.py