Pep8 compliance.
Fix xml_templates

Merge commit '4eeea4b'

Conflicts:
	saml2idp/xml_templates.py