Adding redis + sphinx in .brew and mergetool in .gitconfig