Test for return condition, instead of other way around
Test for spacing issues

Test for spacing issues that occur in plain text rendering when
including another template.

Also, make the HTML version render paragraphs.
Get rid of trailing newline in input files

A trailing newline can cause spacing issues in templates.