Join in ContactInfo
Make ContactInfo optional
Allow contact_info to be set when creating a user
Add some users