better grep'ing of service names

I had problems with cf-ssh not working because my org had the same name as the app. Also, grep'ing for commas or spaces around the app name should reduce false positives.

Great utility though!