Allow clearing config settings
When not forking log to console
Merge remote-tracking branch 'parent/master'