clened up the gitconfig file, and added merge tool to be used
merged with master