Reorganized vimrc and more mappings