Markup.html should extend Component.html by default

[grdunn]

markup.html should mirror what's inside component.html by default, and allow overrides.

Currently, nunjucks doesn't allow raw includes -- so unsure how to reconcile this.