finish sentence here, and reflect implementation
Merge branch 'master' of https://github.com/hannesm/xmpp-client
refactor some list juggling code