Vim Pluginのダウンロード先を変更
Merge branch 'master' of https://github.com/mizutomo/dotfiles

Conflicts:
	vimrc
Add new vimrc
Merge from github