Set vim as git merge tool
Merge branch 'master' of github.com:everett1992/dotfiles

Conflicts:
	vim/bundle/vundle