Added new git configurations for colors and diff/mergetool

-new custom bash script for running diffs