Add support for Buildout 2
Wording

This issue is not about Buildout 2 but rather Pip installation of Buildout 2
Wording [ci skip]
Merge branch 'master' into aclark-buildout2-compat

Conflicts:
	CHANGES.txt
Merge pull request #6 from plone/aclark-buildout2-compat

Add support for Pip-installed Buildout