Replace id[A].map(f) with lift(f)

Conflicts:
	src/main/scala/scalaz/stream/merge/JunctionStrategies.scala
	src/main/scala/scalaz/stream/process1.scala