More config stuff; particularly augroups in the vimrc