Fix sh highlighting
Fix CPP multiline directives
Update dem tests
Stash
Merge master
Fix comment highlighter
Update test
Merge pull request #1236 from ajaxorg/mode-updates

Mode updates