another scalaz upgrade, another NEL renaming
Merge branch 'master' into scala-210

Conflicts:
	build.sbt
	src/main/scala/Jsonz.scala