Clean up turds during a make distclean
Remove trailing whitespace
Merge pull request #294 from dmcdougall/more-vpath-fixes

More vpath fixes