Py3k fix (raw_input)
Merge branch 'develop' of https://github.com/gmatteo/pymatgen into develop