Merged
Bump Plone, twisted and wokkel versions
Merge branch 'master' of https://github.com/collective/collective.xmpp.buildout