upgrade to Scala 2.10.4

I'll merge it myself if Travis passes