tweaks for scala 2.10
Merge pull request #11 from aboisvert/scala-2.10.0

tweaks for scala 2.10