Merge branch 'master' into vbjay/master
Clean up.
Merge branch 'pr/n1_jbialobr' into Portable
Make it easier for user to find settings by sorting keys.
Fix bug where settings were not being retrieved again if file was modified.