Adding "auto" and "%" for margin

* Adding auto, inherit, and percent
* Making test adjustments to accommodate simplified code
* Leaving one broken test to correct later today.