When I open the files in VI I get all these pesky ^M chars

Are you really using vi? If so, I'd recommend installing vim. One of the (many) features it provides is the ability to transparently read/write files DOS line endings. This might be handy in the event that you need to give the modified source files back.