lots of stuff
Merge branch 'master' of https://github.com/ecardinal/exploring_test_generators

Conflicts:
	tests/test_json.py
	tests/test_w_yield.py
	tests/testbase.py
	tests/tests_for_grins.py
	tests/util.py