Merge pull request #1 from zfs-osx/master

Merge upstream
Fix build failure due to undeclared zfsvfs
Merge pull request #83 from evansus/master

Correct build failure in due to undeclared zfsvfs