Change iconify keys
Add .gitconfig to mergerc
Stop ncmpcpp from changing the terminal title
Add i3lock to susp alias in .zshrc
Improve spectrwm colors
Change merge tool to vimdiff in .gitconfig