Merge 

Sending pull request. Changed some things in the editor to work with the way Ken set up the editor utility. Pretty sure most of the other work right now was merged with Alex's pull requests