envelope refactoring and cleanup
Merge branch 'master' of github.com:johnforester/jfsynth