Also use sed to remove now unneeded Vim lines, 2to3 -f ws_comma to fix
some whitespace, and fix some other madness manually.

holy diff batman!

This is a workaround until the whole update_contact method is gone. It should not be needed.

(I don't think what we have here is good, but it is atleast readable)

One of the methods was duplicated. Additionally, apply a very few coding standards.

Remove logging of callback method calls. Such cross-cutting concerns are better directly implemented in the xmpp dispatcher.

Plan is to move our ConnectionX classess to the protocol package one by one. Each move should be more than a simple copy paste. It should be preceeded by cleanups and the like.