Minor tweaks to match my old vimrc