Refactored code to allow more flexibility in parsing the results from
CAS before handing off control back to Shib.

Fixed a bug that made it possible to get multiple
EntityIdParamaterBuilders (thus multiple copies of the parameter in the
request)