Merge branch 'master' of github.com:zfs-osx/spl

Conflicts:
	README.markdown
Merge branch 'master' of github.com:zfs-osx/spl

Conflicts:
	README.markdown