Update buildout infrastructure
Merge branch 'master' of github.com:vwc/kaiser