kill CRLF (dos2unix)
clean whitespace
tabs > spaces
Merge branch 'cleanup'