Highlight Vim column 80
Start using Fugitive again

It has some nice features for resolving merge conflicts.