Reformat columns, and add optional colorcoding

Shorter branch names, branch number is right next to log string.

Yellow highlight is your current branch.
Grey highlight is master-merged branch.

Configure the color with 

[color]
    change = [(auto)|False]