fix vimrc after merge
fix xdefaults for urxvt