Fix a non-word
Fix bug in measuring of lines with only collapsed elements

Closes #1559
Support a disableInput property on keymaps

Stop suppressing key events for nofallthrough keymaps.

Issue #1558
merge with CM master
Merge branch 'master' of https://github.com/jessegrosjean/CodeMirror