Merge pull request #1 from zephyr/master

Minor: Strip out the ^M characters on .py file line endings.