Bump Scala version to 2.10.4.
Merge pull request #1212 from ijuma/feature/scala-2.10.4

Bump Scala version to 2.10.4.