Use regexp-opt to create the keywords regexp
Merge pull request #3 from purcell/regexp-improvements

Use regexp-opt to create the keywords regexp