Unite用設定追加
Merge branch 'master' of github.com:kgfnk/dotfiles

Conflicts:
	.vimrc