Prevent onFocus/resetInput from interfering with nested editor
[brace-fold addon] Use getTokenStyleAt instead of getTokenAt when scanning
Use a bigger search range when finding a start-of-parse point in mixed modes
[brace-fold addon] Fix bad use of lastIndexOf
[velocity mode] Update

 * Updated for CodeMirror 3 - added comment clock declarations

 * Corrected handling of macro calls with a body

 * Added extra features for detecting variables within strings and
   methods & properties of objects

 * Corrected the detection of methods and properties of Java objects
(Mostly) handle cursor positioning around multiple bookmarks in same position

Closes #1726
Disable another test on Phantom

(Works in real browsers.)