Moved mappings directly into the vimrc