Make comments gray and variables magenta
Merge branch 'master' into gh-pages