adding WORKON_HOME in zshrc
fixing indentation on gitconfig
removing global config for master and developmente branches on gitconfig
using p4merge as mergetool on gitconfig (also adding giggle configs)