More improvements for E-matching
dos2unix conversion for a number of files; this avoids spurious conflicts when merging to master
Merge branch '1.0.x'