Use UNIX line endings!
Strip trailing whitespace
Merge pull request #42 from jrha/master

Fix white-space issues