add intelliJ as git mergetool
Update .gitconfig
Add IntelliJ as difftool + change sublime text 2 symlink to bin for Sublime text 3
Correct url to intelliJ as difftool
Add directories to /opt/local/bin:/opt/local/sbin:/Users/svasseur/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/local/git/bin:/Developer/usr/bin + .gitconfig intellij and kaleidsocope as difftool/mergetool
update from master
Merge pull request #1 from svassr/lvl-svasseur/gitconfig-mergetool

Lvl svasseur/gitconfig mergetool