Some more minor changes to vimrc