Fix complicated cases and a typo in avoid_collisions
Use the skip stack when calculating the available width of the first line
Fix avoid_collisions again
Don't set margins with over-constraint block-level boxes (useful for floats)
Fix tests