Fix vimrc
Merge branch 'master' of https://github.com/shin-en/dotfiles

Conflicts:
	.vimrc