scalaz 7.1 take 2

Reinstate these commits.

/cc @etorreborre @charleso