more updates to ZEditor

holy shit this actually was able to sync over 5 updates worth of stuff

i was freaking out because git likes to not like to sync if two commits
have one file changed, even if its a simple merge.