Refactored for nicer interface.
Merge branch 'master' of https://github.com/nesi/oa4mp-shibboleth.git