code review updates
codekit
Merge branch 'person-page'

Conflicts:
	config.codekit
	custom-post-types.php