updated tests to reflect new pandas indexing
improvements to clustering, pt 1/?
improvements to clustering, pt 2/?
Merge branch 'master' of https://github.com/tyarkoni/neurosynth