Some further changes to vimrc