Fix single quote and double quote highlighting

It's not yet perfect, this 'commit message' wouldn't be highlighted
correctly, but it's better than before.
Merge branch 'syntax-highlighter'