Don't allow DIFF_EXCLUDES to be overwritten

Using variables works a lot better when you don't overwrite them before
they're used.  Instead of assigning to DIFF_EXCLUDES early in the script
when there's a later assignment, add the new files to be excluded to
that later assignment.
Merge branch 'bug/diff-excludes'