Updated CodeMirror to 3.20; fixed up some components