Minimize diff between templates and upstream default config

Note that @rabbit_settings is always defined now.
Merge pull request #224 from vuntz/icehouse-conf

Minimize diff between templates and upstream default config