Minor cleanup.
Merge branch 'master' of github.com:materialsproject/pymatgen
Add primtiive and sort to read_structure.
Fix primitive onluy for cif.