Fix .vimrc bug and change cpd map to ,r