Upgrade to new version of pymatgen