Fixed bug that raised OSError when trying to remove a folder that wasn't empty.
Merge branch 'master' of https://github.com/csdms/wmt