fix buildout + pep8