Reboot of clustering

This is pulled off of `master` this time instead of `dev`, fixing weird merging issues occurring in https://github.com/mwaskom/seaborn/pull/73