Fix test skipping for site clustering.
Merge branch 'aqueous_compatibility' of github.com:materialsproject/pymatgen into aqueous_compatibility