Added \r characters to strtok calls.

The original data files used Windows newlines.
Merged the data file compatibility branch into the master branch.