rm won't remove the containing directory if a file is removed out from under it, which means the directory will still be there but will be empty.  This is not a problem, so pass '-p' to not fail on already existing directories.
Merge pull request #862 from pagespeed/jefftk-rmdir

testing: give '-p' to mkdir