gitk: Merge branch 'new' of https://github.com/vnwildman/gitk