vim-powerlineからpowerlineに移動
Merge branch 'master' of github.com:ryshinoz/dotfiles

Conflicts:
	.vimrc.neobundle