Add collective.directory. ##
Merge branch 'master' of github.com:IMIO/buildout.cpskin

Conflicts:
	sources.cfg