Moved plugin mappings to corresponding plugin sections
Tidy up gvimrc