Pulling in latest changes in the 2.1.x branch into master.

Conflicts:
	src/main/scala/org/scalautils/Prettifier.scala
Initial version of aggregated gentests.
Remove scalaVersionToUse and use scalaVersion instead in sbt build.
Reduced duplication in scalatest.scala by using shared settings.