fixed "both modified issues"
updating scaladoc for scalatest
updating scaladoc for scalatest
updating scaladoc for ScalaTest in enablers and events
adding links to Scaladoc
Merge branch 'darlene-scaladoc-for-scalatest-08' of git://github.com/wallachd/scalatest into merge-darlene-scaladoc-for-scalatest-08.

Conflicts:
	src/main/scala/org/scalatest/WordSpec.scala
	src/main/scala/org/scalatest/events/Event.scala
	src/main/scala/org/scalatest/events/NameInfo.scala
Added requireState method to Requirements.
Added requireNonNull to Requirements.
Ignore .swp files, created by vi.
Merge branch 'requireState-macro' of https://github.com/cheeseng/scalatest
Merge branch 'requireNonNull-macro' of https://github.com/cheeseng/scalatest
Brought back StringShouldWrapper to deal with problem of importing Matchers._
above FlatSpec (and WordSpec), which broke in 2.1.RC1.
Merge branch '2.1.x' of https://github.com/scalatest/scalatest into 2.1.x
Improved Scaladoc for Prettifier and RandomTestOrder.
Merge branch 'merge-darlene-scaladoc-for-scalatest-08' of https://github.com/cheeseng/scalatest into 2.1.x
Fix a few typos in Scaladoc tweaks.
Merge branch 'master' of https://github.com/scalatest/scalatest
Merge branch '2.1.x' of https://github.com/scalatest/scalatest