Conform to our new line-ending standard

No files should be checked into source control with carriage returns. Fix some of the files that have them now. This is what makes the diff large and largely incomprehensible, since the before and after look identical.

Tests should be prepared to have .expected files checked out with carriage returns (this is a Git setting on Windows) and for actual results to contain them (there is no way to prevent PrintWriter.println() from doing this). Add some \r removal code to test framework.