Set sublime as the mergetool
Update zsh theme
Remove alias
Add new tools