Add conventional cif option.
Merge branch 'master' of github.com:materialsproject/pymatgen
Automatic Py3k merge for testing