Update buildout.cfg to be in sync with master again