Fixed codemirror imports
Merge branch 'master' into slide-snapshots