Add GLSL mode
Merge branch 'master' of github.com:nicholasbishop/emacs-conf