Merge pull request #2 from shurcooL/dev

Work on improving event processing, multiple highlighters, live/not-live controls.