Add option to skip folders
Merge branch 'skipfolders' into vfolders
Fix: Perform the check if a folder should be skipped at the right location