Better organization name matching

Handles matches with more than one result.
Merge pull request #230 from theodi/bugfix-organization-matching

Better organization name matching