Updating to scala 2.11