modified .osx; added .gitconfig