A few more tweaks to the old vimrc