New and improved .vimrc!
Merge branch 'master' of github-akesling:akesling/dotfiles

Conflicts:
	.vimrc
New submodule!