update to buildout 2.1.0 and .cfg fixes