Merge branch 'master' into v4

addon/fold/markdown-fold.js

addon/hint/show-hint.js

addon/lint/yaml-lint.js

addon/search/search.js

demo/folding.html

doc/compress.html

keymap/vim.js

lib/codemirror.css

lib/codemirror.js

mode/htmlmixed/htmlmixed.js

mode/index.html

mode/markdown/markdown.js

mode/meta.js

mode/octave/index.html

mode/octave/octave.js

mode/solr/index.html

mode/solr/solr.js

mode/xml/xml.js

test/test.js

test/vim_test.js