Merge pull request #56 from danr/master

Use default instead of overriding highlighting links
Make a highlightning group for expression keywords