Merge pull request #36 from HaToHo/master

Missing metadata in function call.
Use the correct attribute names.
Use the correct attribute names.
Merge branch 'master' of github.com:rohe/pysaml2

Conflicts:
	src/saml2/assertion.py
May not add content type if one exists in the header.