Code simplificaiton for enumlib.
Merge branch 'master' of github.com:materialsproject/pymatgen
Code cleanup.