Bump to 2.0.1 and to Scala 2.10.4