Closes #78 and makes some great overall improvements to model construction. Also
fixes a bug where trumpet was overwriting the layout's <head>.