More of the example scaffolded.
Merge branch '2.x' of github.com:balderdashy/mast into 2.x