Add vim-unimpaired and removed several duplicate mappings