Merge in Mike Liddell's patch on paths and Matt Farrellee's findings on atomicity of {{rm -rf}} in the current codebase.