Move more stuff to mustache templates.
Merge branch 'master' of github.com:TheLeagueOfGentlemen/sinkerator