On git master branch merges with --no-ff
Add python commentstring in vim
Use author date instead of commit date in lg aliases