Latest changes + clustering.
Merge branch 'master' of https://github.com/ttblue/human_demos