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

Conflicts:
	vim/.vimrc