Fix everything
Merge github.com:kdh0428/vimrc

Conflicts:
	vim/vim
	vimrc