Re-designed UserOption, much simpler API, and enables the use of System options (see #198).  Regression tests passed.  Tests for new I18N and new UserOption still to be completed