Bug fixes
Merge branch 'master' of https://github.com/mbkumar/pymatgen
Merge branch 'master' of github.com:materialsproject/pymatgen