Allow Vasprun to parse xml files containing ********* fields in the
self-consistent step (but raise a warning)
Merge branch 'master' of github.com:materialsproject/pymatgen
Automatic Py3k merge for testing