Clean-up of API for filtering contacts by phone or email. The api is now symmetrical.

Also, giving Presence.RAW_CONTACT_ID and Presence.DATA_ID unique ids to allow easy joining.  The main rationale for this is that SQLite does not allow cross-database joins in VIEWs, so we cannot hide this join inside a VIEW.