Fix rename
Merge branch 'glenn/file-system' of https://github.com/adobe/brackets into glenn/file-system