Merge branch 'master' of https://github.com/rhoerbe/pysaml2 into rhoerbe-master

Conflicts:
	doc/examples/idp.rst
	example/idp2/idp.py
	src/saml2/attributemaps/saml_uri.py
	src/saml2/sigver.py