Fix issue #510: Support text blocks in Diet templates

Fix issue #510 
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 the list when I'm doing git rebase -i HEAD~3