Presence fixes

clean up of presence, mostly to assure we don't have double Contact instances, and all together better use of XmppAddress vs Contact.