buildout infrastructure update
prepare release
merge with 1.1
rm base.cfg