also end drop on ctrl-click on mac
Update to latest CodeMirror upstream master
- Update SHA to our CodeMirror fork's master, which is now clean with upstream
  (brackets-sprint20 branch in the adobe/CodeMirror2 fork is no longer needed)
- Fix htmlmixed mode to specify parameters for handling mustache/handlebars
  templates, as required by latest CodeMirror
- Reinstate commented-out unit tests from #2887 since the underlying CM bug
  should now be fixed
Merge pull request #2901 from adobe/randy/issue-2860

Also end drop on ctrl-click on mac
Merge pull request #2904 from adobe/nj/sprint-20-cm-update

Update to latest CodeMirror upstream master
Update CONTRIBUTING.md