Consolidate autocommands into the augroup

This makes it so resourcing the vimrc file doesn't duplicate the
auto commands.
Local changes to date

* Modified to be more likely to be able to keep current via upstream
Prune remotes on rebase
Adds rebase-upstream alias