Initial person of contact import support and removal of other people mapping support
Fixing some conflicts with the merge
Merge pull request #403 from reciprocity/feature/people_mapping_changes

Can now map person of contact on imports