unite.vimを追加
Merge branch 'master' of https://github.com/awaki75/dotfiles

Conflicts:
	.vimrc