Fix issue #510: Support text blocks in Diet templates

Again, not sure if it is the best approach.

Hmm, I can't get rid of this "Merged branch into branch" message.
It doesn't appear in list when doing git rebase -i HEAD~3