Modified to build with Scala 2.10.1.
Merge pull request #187 from sprowell/master

Migration to Scala 2.10.1.