add saltstack/salt-vim
Merge branch 'master' of git://github.com/jgmize/dotfiles

Conflicts:
	.vimrc