Clean up test generation to not use generators anymore and use parametrization
Make this less invasive
pep8
Merge branch 'master' into no-more-generator

Conflicts:
	tests/hazmat/primitives/utils.py
Merge pull request #303 from alex/no-more-generator

Clean up test generation to not use generators anymore and use parametrization