Consolidate autocommands into the augroup

This makes it so resourcing the vimrc file doesn't duplicate the
auto commands.