Merge pull request #4 from affinitic/master

Add buildout and fix dependencies