Fix grep path

grep is in /bin on UNICES (even on Fedora, via a symlink)
Merge branch 'for_upstream' of git://github.com/sathieu/horde into sathieu-for_upstream