Updates for scala 2.11.

I was in the neighborhood.