Minor clean up.
Merge branch 'master' of github.com:materialsproject/pymatgen
Merge branch 'master' of github.com:materialsproject/pymatgen
Merge branch 'master' of github.com:materialsproject/pymatgen
Minor update to matgenie.
More minor fixes.