resolving conflicts
Merge pull request #43 from tl-its-umich-edu/authn

TLPORTAL-68: Specify user explicitly for testing.
merge conflicts, again
TLPORTAL-50: authn fixes for gems and debugging
TLPORTAL-50: authn fixes for gems and debugging
TLPORTAL-50: add test shell for processing bad user
finish merge
fix WSO2 tag names