ignore swp files
retry rmdir a few times
Merge pull request #237 from oortcloud/235b-retry-rmdir

retry rmdir a few times
Merge branch 'master' into rolling-timeout