Merge pull request #27 from spawnthink/master

Improve handling of exceptions on setting up XMPP connections (issue 26)