Make git diff place nicer with tabs
Merge branch 'master' of github.com:alexandernst/dotfiles