WIP
Merge branch 'vim' of github.com:dannyamey/dotfiles into vim

Conflicts:
	.gitmodules
	vimrc