Move space into 'bindings' addition.
Add new Commentary section to file header
Remove newlines from change text in cm-substitution-string

Newlines aren't matched by the .*? construct in the string-match calls.