Fixed scalaz module names
Merge branch '0.4.x'