Bump Scala version to 2.10.4
Merge pull request #2617 from richdougherty/scala-version-bump

Bump Scala version to 2.10.4