Use a uid@provider syntax

provider?uid was confusing.  uid@provider is more common and is more readable
Merge pull request #54 from mfairchild365/user-query

Use a uid@provider syntax