fix bug in cif parsing when data looks like a cif key
Automatic Py3k merge for testing