various updates
test

Conflicts:
	scripts/runner.pyc
	scripts/template_writer.pyc
	scripts/tri_driver.py