Make 2.10.4 the default, move to scalatest

Twitter is about to move to 2.10. This patch clears the way for a 2.11 crossbuild.

relates to #180