Updating vim things
Merge branch 'master' of https://github.com/att14/dotfiles

Conflicts:
	vim/.vimrc