properly handle deleting of folders from the 'File' menu
Merge pull request #1514 from swryan/filetree

properly handle deleting of folders from the 'File' menu, add test