Bugfix for cif parsing with primes. e.g. C1'
Automatic Py3k merge for testing