Update to ScalaTest 2.0 & Discipline 0.1

ScalaTest 2.0 deprecated some matcher syntax, which I just replaced to use the new syntax.