fix rc
Merge branch 'master' of github.com:yuki-hirako/dotfiles

Conflicts:
	dot.vimrc