add two vim plugins, fix CapsLock mappings
update mappings