Merge branch 'forever'

Conflicts:
	zfSnap.8
Merge branch 'version'
Merge branch 'small_fixes'