Small non-code edits
Merge branch 'master' of github.com:mjharrigan/HEP-CE

Conflicts:
	src/Cohort.h