Ignore \r in output matching
Ignore \r in output matching

Windows occasionally has \r\n while everywhere else has \n. Instead of worrying
about the difference, just replace all instances of \r with nothing and rely on
matching against \n.

erickt/cargo,erickt/cargo