Update fisa-vim-config from master & merged with keymap-customizations branch off my fork