Clean up whitespace / line endings from last commit
Merge pull request #12 from jstamp/bloody-line-endings

Clean up whitespace / line endings from last commit