cleaned up zsh functions
added p4merge as git mergetool