Update vertical rhythm helper to handle border

Handles misuse of border on height-based elements. Border is included in
the height since the border-box model is being used. Border only needs
to be subracted for text-based elements.