Allow arbitrary config settings

Rather than checking requested settings against a list of allowable
keys, simply allow anything to be set in config.yml
Remove commented out lines
Merge branch 'allow-arbitrary-config-settings' into smr