Add more vim plugins
Reformat mappings