Making shibboleth login more configurable
Merge branch 'master' into USC
more generic login vars
Merge branch 'master' into USC