Merge pull request #36 from paulp/scala-210

Ported to scala 2.10.
Revert unintentional change to scalamock repository.
Misc version updates.
Merge pull request #43 from paulp/scalamock-fix

Fix scalamock dependency + version updates.