Minor change to not use multiprocessing when there is only one file.
Automatic Py3k merge for testing