added more newlines between expected/actual values in case of inequality
fixed the breaks with the last cherry-pick
fixed the display of normal examples in script specifications
tailrec'd the TerminationMatcher retry - solved conflict

Conflicts:
	matcher-extra/src/main/scala/org/specs2/matcher/TerminationMatchers.scala
allow methods with parameters to be used w Macro matchers. fixes #285 - solved conflict

Conflicts:
	tests/src/test/scala/org/specs2/matcher/MatcherMacrosSpec.scala