adding glsl stuff (lol, like 3 weeks back), and adjusting xvim setting so it doesnt bork the Xcode5 branch of xvim
Merge branch 'master' of github.com:unphased/vim-config

Conflicts:
	.vimrc
Hopefully this good
Merge branch 'master' of github.com:unphased/vim-config