account for new, more clearly named Persist functions, also account for the complete and utter madness that is the Editor main() routine(s)
Merge branch 'master' of https://github.com/HeliumProject/Helium