Adding ssh-add ;
Merge branch 'master' of https://github.com/pierreburel/dotfiles

* 'master' of https://github.com/pierreburel/dotfiles:
  Adding redis + sphinx in .brew and mergetool in .gitconfig
  Tweaks