removed -S option for LESS
replaced pydf
removed zlogout message
Merge branch 'master' into bender

* master:
  removed zlogout message
  removed -S option for LESS

Conflicts:
	zlogout