Switch to diffmerge
Switch from bash to zsh, first commit of .zshrc file