Use the rm_r helper as much as possible
Merge pull request #171 from eregon/rm_r

Use the rm_r helper as much as possible