[qtcontacts-sqlite] Improve aggregation heuristic

Previously, sharing a phone number or email address was sufficient
to cause two contacts to be aggregated.  If the name does not match,
however, they should NOT be aggregated (eg, family members sharing
a phone number or an email).
Merge pull request #42 from chriadam/aggquery

[qtcontacts-sqlite] Improve aggregation heuristic