Update submodule
Merge origin
Remove neobundle.vim from submodule