upgrade to scalaz 7