update i3 and git log settings
Merge branch 'master' of https://github.com/spezifanta/dotfiles