Fix CRLF

NOT FOR MERGING.

The only changes between that branch and master is the removal of the carriage returns in order to make the comparison with truecrypt 7.1a easier.