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

Conflicts:
	pymatgen/analysis/structure_matcher.py
Minor cleanup.