-- Replaced kdiff3 with meld. Added coloring and zsh aliases.