Fixed problem with common JSON_DUMPS_ARGS
PEP-8 fixes
Merge branch 'master' of https://github.com/rohe/saml2test

Conflicts:
	src/__init__.py
	src/idp_test/__init__.py
	src/idp_test/interaction.py
	src/saml2test/interaction.py
	src/saml2test/opfunc.py
	src/sp_test/__init__.py
	tests/idp_test/target_idp.py
	tests/localhost.py
	tests/sp_test/targetsp.py

Merged code from upstream and fixed some problems that popped up