Revert "Revert 1df51c2592 for .i3status.conf"

This reverts commit 3ea099a04bbc667afeb4d6781f0101c641a123d0.

Also, I now understand why git reset makes sense for "reverting" a
single file
Fix up git config settings