refactor default xmpp handler. 200-line methods are hard to read
Merge pull request #795 from getlantern/refactor-default-xmpp

refactor default xmpp handler