add vimrc
Merge branch 'master' of https://github.com/chozekun/misc

Conflicts:
	.vimrc