More updates to doc.
Merge branch 'master' of github.com:materialsproject/pymatgen
Merge branch 'master' of github.com:materialsproject/pymatgen