add to_settings_hash
merge settings into correct bucket
Whitespace fix
Changelog updated