Merged in Chee Seng's branch in which he fixed the sbt integration bug
reported by Dmitry. Cmd I used:

svn merge -r5178:HEAD https://scalatest.googlecode.com/svn/branches/cs-sbt-4


git-svn-id: http://scalatest.googlecode.com/svn/trunk@5194 fd1274fd-080f-5963-8033-43ee40fcd1de