Fix up the output for the event dump a bit... just consmetic
Little work on the active output... still more to go to make it more consistent
Merge branch 'master' into gh-pages
Updating gh-pages via grunt