- trap case where tempdir returns directory containing user's code,
  eg MinGW MSYS Perl tempdir returning cwd
- dereference hash on last arg to remove_matches_2re


git-svn-id: svn://svn.code.sf.net/p/cloc/code/trunk@313 0e9fd002-ee37-4bff-9a6e-d24515d67fd4
add 3rd gen scale factor for Maven/XML (otherwise --write-lang-def
generates an undefined value error)


git-svn-id: svn://svn.code.sf.net/p/cloc/code/trunk@314 0e9fd002-ee37-4bff-9a6e-d24515d67fd4
new option, --force-lang-def

Changed behavior of --read-lang-def to merge, instead of overwrite, internally
defined language filters; where there are conflicts, use cloc's definition.
The old behavior of --read-lang-def, which override's cloc's definitions,
is available with --force-lang-def.

more cleanup of cloc.1.pod, replacing <xx> with XX


git-svn-id: svn://svn.code.sf.net/p/cloc/code/trunk@315 0e9fd002-ee37-4bff-9a6e-d24515d67fd4
Merge branch 'master' into simba