Updated for CodeMirror 3 - added comment clock declarations
Corrected handling of macro calls with a body
Corrected the detection of bodyContent and velocityCount
Added extra features for detecting variables within strings and methods & properties of objects
Corrected demo source