Updating the git config for my n00b preference for a decent diff tool and adding in my user creds