Updated some aliases
Added some keymappings to .vimrc