Added -t support to Framework.
Disallow any suffix for arguments that does not take any suffix.
Bump up release version to 2.1.3-SNAPSHOT in SBT build.
Backed out the change that disallows characters right after -h
without an intervening space, because HTML reporter can take
config params.
Forgot to commit before attempting to push the
merge from 2.1.x, so this includes a merge from 2.1.x
to pick up the -t support in sbt as well as disallowing
characters after most command line parameters. And
it includes adding a retry of a flickering test in
DispatchReporterSpec.

Conflicts:
	project/scalatest.scala