Added multiple cursors checkbox to settings dialog and attached to ace editor.  Switched preferences from localStore to SparkPreferences instance.
Switched from preference to command line flag
Resolved conflicts
Fixed mistakes from merge and explicitly set multiselect based on flag
Resolved conflicts and added method to mock