Don't send discovery starting or completed messages if we're not actually performing discovery
Adjusted scaladoc in GenFactories.scala.
Adjusted scaladoc in Matcher.scala.
Completed scaladoc in Collecting.scala.
Deleted collectingNatureOfGenMap implicit in Collecting.scala which is no longer needed.
Adjusted to avoid potential match errors.
Bumped version number to 2.0.RC1-SNAP5.
Merge branch 'collecting' of https://github.com/cheeseng/scalatest
Merge branch 'match-error-2' of https://github.com/cheeseng/scalatest
Merge branch 'jira-248' of https://github.com/gcberger/scalatest
Resolving conflict.

Conflicts:
	src/main/scala/org/scalatest/enablers/Collecting.scala
Changed TypeConstraint to Constraint.
private[scalatest]ed out the actual AMatcher and AnMatcher traits.