edit vimrc
Merge branch 'master' of https://github.com/wanashi/dotfiles

Conflicts:
	.vimrc