Make the contacts db always get email and phone number and make it ignore the username/spa requirement aspect
Address review comments and tidy up
Merge pull request #387 from Standard8/contacts_db_simplify

Simplify the Contacts import and DB - always load email and phone number regardless of SPA