Add buildout and fix dependencies