rearrange the bench scripts slightly
Merge branch 'rip_out_instrumentation_15-buck'

Conflicts:
	Makefile