Use vimdiff as the default diff.tool
Set default textwidth to 79

Also set colorcolumn at +1. This has the effect of always coloring the
textwidth + 1 column.
Remove powerline