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

Conflicts:
	pymatgen/transformations/tests/test_advanced_transformations.py