Add uid support
Merge branch 'master' of https://github.com/ebollens/shib-oauth2-bridge