removing P4merge and adding Ksdiff tool
fixing gitconfig to add ksdiff(Kaleidoscope) as main diff and merge tool