Cleanup git log aliases and add ls-untracked alias
Set p4merge as default Git mergetool