Some vimrc updates
vimrc cleanup