Fix white-space issues

DOS line endings and trailing white-space, ugh.