Tweaked the test.jinja template to ensure that generated tests work.  Working on tying everything together with the etlTest main file.
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	etltest/test/test_code_generator.py