Beta-reduce for readability
Correct highlighting of last letter of pragma
Merge pull request #93 from david-christiansen/master

Code cleanup + minor highlighting fix