Simple upgrade to scala 2.10