Added some Location guessing and Organization prefix handling
Merge pull request #25 from jgilme1/alternativeStrings

Added some Location guessing and Organization prefix handling