Add some submodules, vim mappings