Add some vim higlight additions
Merge branch 'master' of github.com:japaniel/dotfiles

Conflicts:
	vim/.vimrc