Travis build: bump scala to 2.10.4
Merge pull request #49 from cvrebert/scala-2-10-4

Travis build: bump scala to 2.10.4