Moved new settings work by hand into leoSettings.leo.  This prepares to delete the new-settings-branch branch.

Leo build: 20140912072909