Merge pull request #20 from fredrikt/master

test multiple_signatures
Added support for entity categories.
Added support for entity categories - datafiles.
Added support for entity categories - some fixes.
Missed one file.
Merge branch 'master' of https://github.com/rohe/pysaml2

Conflicts:
	src/saml2/config.py
	tests/idp_conf.py
	tests/servera_conf.py