Add a 'describe' for the contacts.dummy module, and put infer_addr_type and format_addr's tests there, instead of in DummyContactsResource's 'describe'
Use 'user1' for the user_account in the contact tests
Add a 'describe' for the contacts.api module
contact.api -> contacts.api in test describe
Merge branch 'feature/issue-114-fix-odd-things-in-contacts-tests' into feature/issue-99-add-contact-and-contactstore

Conflicts:
	test/test_contacts/test_api.js