Changing submodules to use my branch.
Add some initial support for margins, padding, and border layout
calculations.