sort folders first, then files
Merge pull request #1620 from devoncarew/devoncarew_sort_folders

sort folders first, then files