Upgrade to scala 2.10