Upgrade to CodeMirror 3.1

Now we need to specifically include the bracket matching extension.
Merge pull request #393 from jasongrout/codemirror3

Codemirror3
Fix shift-enter to not insert empty line by overriding the shift-enter of codemirror
Fix height of codemirror, since the CSS to do this changed in version 3.1