unite-railを入れました
Merge branch 'master' of https://github.com/hadashinogensan/vimrc

Conflicts:
	.vimrc.plugin