Return function from __call__, so it actually registers.
Update types in plugin.py to the new hook types
Reorder *Hooks in plugin.py. Doesn't actually change anything they do, just order in file.