added buildout and dx
Merge branch 'master' of git://github.com/collective/Products.Collage