Take into consideration empty directories left behind and some other kinds of files
Merge pull request #1 from jcmuller/improve_mergeclean

Take into consideration empty directories left behind and some other kin...