Filter by orgid (LP# 12419436)

I never did finish the orgId based authentication because I'm still not sure how to authenticate that, but what I did write for it is also in this pull request.