Cleanup.
Merge branch 'master' of github.com:materialsproject/pymatgen

Conflicts:
	pymatgen/entries/compatibility.py