Removed a few old things.
Sexified the mast example to show all the new shorthand.
Merge branch '2.x' of github.com:balderdashy/mast into 2.x