wip
Merge branch 'master' into text-blockstache
Added in-text block mustache shorthand.

Fixes #52.
version bump