Finalize shapeless 2 and scalaz-stream upgrades