Fixes, updates for 2.5, TemplatePlus (follow-up to #14 )

This is a follow-up to #14 which can't be reopened now that it has been closed. I have dramatically updated EDIF in many ways - there is too much to list. Let me know if anything needs changing before this PR can be accepted.