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!

* now we load roster from DB when we receive an iq result for the roster without any query
* added a "force" argument to NonBlockingRoster.getRoster(), to force the return of the instance

* added "roster_version" in configuration to save roster version for the account
* added "ver" attribute when gajim requests the roster

Introduce a get_instance factory method for all plugins and other xmpp related classes. This will help us to decouple plugs in order to make them testable.

Proposed Fix. Make sure we read all data from our SSL socket wrappers and don't just rely on gobject.io_add_watch, select or poll.

This isn't really a clean solution, but the less intrusives fix that I can think of. Fixes #2634.

 * Use namespace instead of attrs={} for addChild
 * Unplug SASL module on auth failure (we currently disconnect so don't really need it)