Port of fixes for #1 and ValidationMatchers clean up for scalaz 6.0.x