Minor
Merge branch 'mag' of github.com:materialsproject/pymatgen into mag