more line-ending fixes
Merge pull request #1578 from stefanpenner/line-endings

more line-ending fixes