Lots of changes to the edit view.  Getting there.
Merge branch 'master' of github.com:mdlayher/khan