Merge pull request #85 from justinsb/match_service_by_type_not_name

Support matching by type in the service catalog