Merge pull request #852 from dorkster/events

Integrate event parsing into NPC dialogs