Mustachery revisions based on Mr. Shaw's test run.
Merge branch 'master' of github.com:tableflip/meet-meteor