Replace </p> lost in excerpt trim, and fix placement of <end_excerpt> in template to prevent addition of empty paragraph