Updated documentation of pyoidc OP to include setup of multi auth.
Merge branch 'develop' of https://github.com/its-dirg/pyoidc into develop

Conflicts:
	doc/howto/op.rst
Merge branch 'master' of https://github.com/rohe/pyoidc
Merge pull request #36 from its-dirg/master

multi auth + cookie handling
Allow the expiration time of the id_token to be specified.
Merge pull request #37 from its-dirg/id_token_fix

Allow the expiration time of the id_token to be specified.
Allow extra claims to be added to the id token.
Merge branch 'develop'
Merge branch 'id_token_fix'