update vimrc
Merge branch 'master' of http://github.com/horimislime/dotfiles

Conflicts:
	.vimrc