First commit
Merge https://github.com/nigellegg/clusterer