Removed external diffs and mergetools
Made some alias cleaning