dos2unix
pep8
Merge branch 'cleanup'