Standardized event names and namespaces + Text edits + Cleanups.

Must still add many more events later.
Merge branch 'master' into gh-pages