Merge pull request #277 from csmith/master

Make HighlightManager raise events.
Fix incorrect import.
Merge pull request #278 from greboid/master

Fix incorrect import.
Add a todo list to the new format file.