upgrade to Scala 2.11.0-M3
Merge remote-tracking branch 'origin/master' into scala-2.11

Conflicts:
	build.sbt
upgrade to Scala 2.11.0-M4
upgrade to sbt 0.13.0-RC2

2.11.0-M4 seems to need sbt 0.13 in order for 'sbt console' to work
disable ENSIME until sbt 0.13 version is available
disable optimize, it's too fragile in 2.11.0-M4
Merge remote-tracking branch 'origin/sbt-0.13' into scala-2.11

Conflicts:
	project/build.properties
use ScalaTest jar built for Scala 2.11.0-M4
%% is smart enough to get the right ScalaTest
Merge branch 'sbt-0.13' into scala-2.11
Merge branch 'sbt-0.13' into scala-2.11
Merge branch 'master' into scala-2.11
Merge branch 'master' into scala-2.11
upgrade to Scala 2.11.0-M5

not upgrading ScalaTest yet since I doubt a new jar is available yet
upgrade to Scala 2.11.0-M7
ScalaTest is now available for Scala 2.11.0-M7
Merge branch 'master' into scala-2.11

Conflicts:
	build.sbt
Pair has been deprecated
upgrade to Scala 2.11.0-M8
Merge branch 'scalatest-2.1' into scala-2.11

Conflicts:
	build.sbt