Minor changes to file-browser.
Missing return statement.
Not doing common directory merging.

This caused concurrency problems, as I used an in-place sort on a
property that was also being watched for change.
Merge branch 'file-browser'