CtrlP設定追加
Merge branch 'master' of https://github.com/zeero/dotfiles

Conflicts:
	vim/vimrc
merge commit.