Add IntelliJ as difftool + change sublime text 2 symlink to bin for Sublime text 3