Include carriage return (\r) in whitespace tokens
Include carriage return (\r) in whitespace tokens

We now explicitly include \r as part of a whitespace token.  This
includes Windows-like (CRLF) new lines, since the final \r will get
appended to the whitespace token, and the \n will be handled as in
Unix-like newlines.

marshallward/f90nml,marshallward/f90nml