SOme minor cleanup.
Add option to not include ordered sites in enum.
Merge branch 'master' of github.com:materialsproject/pymatgen

Conflicts:
	pymatgen/core/structure.py