When zfs was set up on uffizi, he git annex was put on a separate zfs pool. We should merge it back to the main pool to reduce the number of moving parts (and of free disk spaces to monitor).