Fixing and stuff

Moved another bunch of objects to XmppConnectivity class. I got VCards
code broken even further, but it'll be redone anyway. But I fixed
diagnostics page which was broken by previous commit.