Use deep-merge on settings
Rename riemann-config-changed-flag
Change default version
Fix server config
Rename config file to riemann.config
Add asserts and logging
Add ensure service