Moved plugin mappings to corresponding plugin sections
Add noremap to all mappings
Add mappings, general tidying up