added some stuff for git and osx