more pedantic clean.sh
Patch by Jim Wise, lp#666884.
Takes care of the few cases of temporary files which are currently
left behind after running clean.sh.
While there, it normalizes the name used for scratch files used in
contrib testing, and updates .cvsignore to match.
This is obviously pedantry, but it's nice to have a clean tree at
the end of clean.sh.