Add a failing test for broken margin behavior
Fix margin box setting
Mark test as resolved
Fix whitespace
Merge pull request #679 from prawnpdf/fix_margin_box

After exiting the top level bounding box, restore the current margins, not an old copy of them