Updates for options editor dialog.
Merge branch 'master' of https://github.com/jsmreese/ddk2