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

also use 2to3 -f ws_comma to fix some whitespace

holy diff batman!

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.

It is more consistent to have this code closer to the xmpp protocol handling.

don't remove a file before renaming under windows because os.remove('test') will remove 'TEST' under window. Fixes #5279

OS X support is still maintained in the osx_newbuildsys branch - and
only there.