revert some changes
do not allow zone-preface content to wrap around blocks
move clear to zone-postscript
add padding to zone-postscript
remove zone-preface padding-bottom, use 2em paddint-top on zone-postscript
switch to margin
Merge branch 'new-rotor' into 7.x-1.1