Updating git ignore, vimrc
Merge branch 'master' of github.com:wilsonandcompany/dotfiles

Conflicts:
	.vimrc