Upgrade to scala 2.10.4
Merge pull request #3 from ebowman/scala-2-10-4

Upgrade to scala 2.10.4