Better manual headings
More detail on errors
Merge pull request #912 from lloydwatkin/xmpp-muc

XMPP MUC