Bug 948415 - Make mock_contact.py pythonic, make
insert_contact convert it to mozcontact API
friendly format. r=dhunt r=zcampbell
Merge pull request #15700 from gentlefolk/948415

Bug 948415 - Make mock_contact.py pythonic, make insert_contact convert it to API-friendly format