Added glsl.
Merge branch 'master' of https://github.com/covertcj/vim-config

Conflicts:
	.vimrc