Ran through dos2unix to remove ^M characters
Merge pull request #1 from cfarquhar/master

Ran through dos2unix to remove ^M characters