Whitespace cleanup (dos2unix, s/ $//g)
Merge pull request #1 from atz/mmilton_master

Whitespace cleanup (dos2unix, s/ $//g)