Changed SharedHelpers as object, and use it by importing instead of mixing it in.
Fixed a conflict in Chee Seng's pull request that changed SharedHelpers
from a mix in to an import. Also fixed a few other places where the mixin
was still showing up.

Conflicts:
	src/test/scala/org/scalatest/OptionShouldContainSpec.scala