Fix wrong newlines
Fix leftover in documentation
Merge pull request #91 from nephila/feature/doh

Some cleanup in settings patching