style changes
Merge branch 'master' of https://github.com/rsludge/zitgit

* 'master' of https://github.com/rsludge/zitgit:
  diff summary line
  use gitlab-grit
force encoding in diffs