color git diff, improve user/email install
tweak spaces