Bumped version to 3.0.0-SNAP3
Made orElse in Or.from(Option) to be a by-name. This was Mirco Dotta's PR, but
he made it against master and I'd like to put it into 2.2.x and pull it over to master.
Merge branch '2.2.x' of https://github.com/scalatest/scalatest
Removed deprecated assertions (expect, assert that returns Option[String], etc.), "Legacy" triple equals things,
FailureOf, the deprecated given/when/then methods that start with a lower case character, TimesOnInt in the
original location in org.scalatest (was a deprecated type alias in the package object), and a lot of
tests of deprecated things, including all the scalautils tests that were testing that the scalautils
name was still working.
Tweaked some more comments in Assertions.scala, and resurrected that in WordSpec.
Dropped the deprecated type aliases in the scalautils package object. That's it for scalautils, other
than any changes we need in the builds.
More deprecation expirations: removed AbstractSuite, Conductor, and ConductorMultiFixture.
Removed methods from Distributor and Stopper.
Merge branch 'remove-deprecated-asserts-etc' of https://github.com/gulaputih/scalatest into 2.2.x
Brought in the latest deprecation expirations from the 2.2.x branch.

Conflicts:
	src/main/scala/org/scalactic/ConversionCheckedTripleEquals.scala
	src/main/scala/org/scalactic/EqualityPolicy.scala
	src/main/scala/org/scalactic/TripleEquals.scala
	src/main/scala/org/scalactic/TypeCheckedTripleEquals.scala
	src/main/scala/org/scalatest/Assertions.scala
	src/main/scala/org/scalatest/AsyncTests.scala
	src/main/scala/org/scalatest/NonImplicitAssertions.scala
	src/main/scala/org/scalatest/WordSpecLike.scala
	src/main/scala/org/scalatest/fixture/WordSpecLike.scala
	src/main/scala/org/scalautils/package.scala
	src/test/scala/org/scalactic/AsMethodsSpec.scala
	src/test/scala/org/scalatest/NonImplicitAssertionsSuite.scala
	src/test/scala/org/scalautils/EverySpec.scala
	src/test/scala/org/scalautils/OrSpec.scala
	src/test/scala/org/scalautils/PrettifierSpec.scala
	src/test/scala/org/scalautils/SpreadSpec.scala
	src/test/scala/org/scalautils/TripleEqualsSpec.scala