Add clustering and improve README

This replaces pull request #5