added my git meld wrapper and updated .gitconfig