Clean up of import people code
Re-clean of same person related code
Merge pull request #322 from reciprocity/feature/people_import_cleanup

People import cleanup and minor changes