think i broke git on my mac, this needs to be merged with the master