Clean up vimrc and add some mappings