Some more changes to vimrc