Added diff tools and git config stuff
More stuff