A bunch of updates from OGN from the previous week
Merge branch 'master' of github.com:e-democracy/buildout-config