added mappings and updated plugins
merged with other version of vimrc