Fixes #271

removes debug code
release id b7913e99bc
removes use of the zenphoto_version option.
Merge remote-tracking branch 'origin/master' into 1.4.5

Conflicts:
	zp-core/githead

	modified:   zp-core/githead
	modified:   zp-core/reconfigure.php
	modified:   zp-core/setup/index.php
	modified:   zp-core/setup/setup-option-defaults.php