Update vim config
Merge branch 'master' of github.com:davejlong/dotfiles

Conflicts:
	vim/syntax.vim
	vim/vimrc.symlink