Correctly munge directories on Windows (7) systems

Signed-off-by: Jann Müller <j.mueller.11@ucl.ac.uk>
Merge branch 'master' into munge-shared-dirs-windows
Remove redundant code

Signed-off-by: Jann Müller <j.mueller.11@ucl.ac.uk>