Updated to scalaz 7.1

.. and could simplify the lifting!