HH Templates for Models ("../generic_hh/")
KABAM!  Its been objectified, table-fied, and parameterified
Merge branch 'jon' into sprint7
merge
Merge branch 'tao' into sprint7

Conflicts:
	kabam/kabam_output.py