JBEHAVE-1053:  Simplification.
Merge branch 'master' of https://github.com/jbehave/jbehave-core

Conflicts:
	jbehave-core/src/main/java/org/jbehave/core/embedder/StoryRunner.java