Upgraded to buildout 2

Refs #1