A test harness
Use standard convention for documenting args
Merge branch 'test-harness'
Merge branch 'master' into group_work_support

Conflicts:
	set-git-user

Also included a couple of usage examples