Remove setuptools pinning to work with zc buildout 2.0.0
Use newer bootstrap for buildout 2.2.0
Merge branch 'master' into sami
Merge branch 'sami' into pco2w
small edit