Minor clean up
Upgrade Scala 2.10.1, close #964