vim update
Merge branch 'master' of github.com:paulbdavis/dotfiles
Merge branch 'master' of github.com:paulbdavis/dotfiles

Conflicts:
	.vim
Merge branch 'master' of github.com:paulbdavis/dotfiles