Couple of tidyings.
Move EDTHandlerInvocationi back.
Fix import.
Merge branch 'master' of https://github.com/DMDirc/Plugins into tidying
Merge pull request #168 from greboid/tidying

Couple of tidyings.