Make 2.10.4 the default, move to scalatest
Merge pull request #196 from twitter/210_default_scalatest

Make 2.10.4 the default, move to scalatest