Make clustering optional

Closes #1
Merge branch 'master' into gh-pages