dos2unix conversion for a number of files; this avoids spurious conflicts when merging to master