Upgrade from Scala 2.10.4 to 2.11.1; fix the warnings from the new compiler.