Lots of syntax stuff
Merge branch 'master' of github.com:lukexor/.dotfiles

Conflicts:
	vim-runtime/vimrc