More Py3k.
Vaspio set now Py3k compatible.
Fix borg test.
More Py3k changes.