Make branch tracking more naive so that stuff just works more often than not.
Prune plugins to what I use.