submoduleの変更?
Merge branch 'master' of https://github.com/arumotech/vimconf

Conflicts:
	vim/bundle/neocomplcache
	vim/bundle/unite.vim
	vim/bundle/vimproc