Multiple improvements

* Add group membership

* Match google contacts without contact_id by email address

* Bugfix bad handling of potential multiple primary phone numbers