Naming and nomenclature
Event field renaming and nomenclature
More field name normalization, clean-up
including naming changes from brian
Merge branch 'master' into naming

Conflicts:
	people.md