merge lots-of-contact-info-2105-2.  allows users to add multiple pieces of contact info at person creation time.  author: moe, reviewer: exarkun.  closes #2105
merge lots-of-contact-info-2105-2.  allows users to add multiple pieces of contact info at person creation time.  author: moe, reviewer: exarkun.  closes #2105

twisted/quotient,twisted/quotient