Undoing borderbox.

Cleaned up the v1.* release to remove the border box work that will make it's way into v2 because it breaks compatibility. Also made some minor changes to grid to lower specificity for colspans, colshifts, colpushes, etc.