remove zopeskel from the suite
remove pre-commit hook as it seems to mess with merges
Simplify buildout so it can be extended; Remove makefile