Change text-margin option to margin

Changing the text-margin option to margin as discussed in #2362.