More Sprint 21 fixes

Fixes for $.extend(). Not sure why this behavior changed since we haven't updated jQuery.

Fixes for CodeMirror v3 tokenizer changes.