Update scala to 2.10.4
Merge pull request #13 from earldouglas/scala-2.10.4

Update scala to 2.10.4