The Windows line endings (^M) can be easily removed with most editors. In ViM it is very easy.
To remove all windows line endings (and replace with nothing), type the following:
(note that the ^V will not display).
Sometimes it is necessary to add a line break as well: