Minor formatting, cleanup.
Vimdiff support
Formatting: tab to spaces.
.Xdefaults is deprecated, use .Xresources instead.
Replace backticks with $() command substitution