Updated merge/rebase aliases
Updated merge tool
Updated git df alias
Commented out unused aliases