disable welcome screen in vim
Merge branch 'master' of https://github.com/j3parker/dotfiles

Conflicts:
	vimrc