Fix custom properties bug reported by Allie Micka

Organization relationship do not do the right thing when importing custom fields, even though it is displayed in the map fields drop down. I suspect household relationship has the same bugs (since the default contact type is Individual)