vimrc: some fixes, make mapping