Merge branch 'master' into slim_refactoring - the right way.

Conflicts:
	src/fitnesse/junit/JUnitRunNotifierResultsListener.java
	src/fitnesse/responders/run/FitTestSystem.java
	src/fitnesse/testsystems/fit/CommandRunningFitClient.java
Merge branch 'master' into slim_refactoring -- override previous errorous merge.
Fix #217 for real.