More simplifications.
Fix RESTer tests.
Merge branch 'master' of github.com:materialsproject/pymatgen