updated to Scala 2.10.2 again, repaired Scala tests, generalized two more zip methods