Updated Vim keybindings
Updated aliases