Many Ed support changes
Ed support changes and bug fixes.
Merge branch 'master' of https://github.com/binnyva/madapp