Sync with upstream master
Updated languages.json to include upstream changes
Merge branch 'master' into cfml
Update CodeMirror version
Merge branch 'cfml' of github.com:am2605/brackets into cfml