Minor cleanup.
Merge branch 'master' of github.com:materialsproject/pymatgen
Merge branch 'master' into aqueous_compatibility