Added code in done method implementation in Framework.scala to wait until server thread in main process (in fork mode) is done before proceed to print summary.
Fixed -o configs get ignored when runs in sbt fork mode problem.
Make Framework to automatically take the first -o or -e when more than one -o or -e is passed in, which will take the -o or -e passed in through test-only's -- list.
Upgraded SBT build to use scala 2.11.1.
Changed travis build to use scala 2.11.1.
Merge branch 'framework-fix' of https://github.com/cheeseng/scalatest

Conflicts:
	src/test/scala/org/scalatest/tools/FrameworkSuite.scala
Merge pull request #329 from cheeseng/scala-2.11.1

Scala 2.11.1 for SBT and Travis Build
Use join instead of a busy wait in Framework. Use set instead of setAndGet on
an AtomicReference, because wasn't using the gotten value, in Framework.
Merge branch 'master' of https://github.com/scalatest/scalatest
Synchronize access to the body of the NoArg in case different threads
are involved. This could happen if someone uses NoArg in a suite that
mixes in ParallelTestExecution. Otherwise it would normally be the
same thread that constructs the test runs the test.
Added shouldBe a/an [Type] syntax support to inspector shorthands.
Work in progress fix for DiagrammedAssertions when used with code block.
Removed the use of convertClassIfNeeded in shouldBe a/an [Type] syntax support.
Make wasNotAnInstanceOf error message to include the actually class of the instance.
Added the correct way to detect for by-name parameter, and all tests are passing now.
Merge branch 'gentests-fix' of https://github.com/cheeseng/scalatest
Fix Scala 2.10 build problem in DiagrammedExprMacro.
Changed to use Eugene Burmako's paramss method in DiagrammedExprMacro.
Make scalactic jar file to include scalautils also.
Bumped ScalaTest/Scalactic version number to 2.2.0-M2.