simplifying zone class, prep to move to ValueTree
Merge branch 'master' of https://github.com/brain-deaf/note-source