neobundle update
rm
rm neobundle
vim/neobundle.vimはignore指定
Merge remote branch 'origin/master'

Conflicts:
	vim/neobundle.vim