submodule updates
fixing merge problems
vim bundle updates