Updated diff and merge tools for git and renamed work-mac/bash_profile