Simplify internals of PDEntry and ComputedEntry.
Merge branch 'master' of github.com:materialsproject/pymatgen