Modified get_primitive_structure()
Changed method of calculating num_fu that works with disordered structures
Merge branch 'master' of github.com:materialsproject/pymatgen