cleaning up git config, adding custom merge tool
better git diffing