Major overhaul -- renaming, refactoring, mainly in xmpp.py, fixes #21