Make.options.tmpl: added diff options for ignoring \r; _gitignore.tmpl: ignoring Mercury.modules