add vimrc
Merge branch 'master' of github.com:kun432/dotfiles

Conflicts:
	.vimrc