Fix test-emacs for MacOSX
Add git grep utility