Change tabs to spaces; Change mintty colors

Specifically, the color of gray used for the history number in the
prompt was changed because it was showing up as nearly invisible in
mintty.
Add winmerge as a mergetool
Merge branch 'working' of github.com:royhaddad/linux-config into local