! This one is just too long for what it is.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! Makes it slightly nicer at the bottom there.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! Oops, $context['show_by'] wasn't actually being honoured for setting up the conditions. Let's fix that, and make the code nicer.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #1008 from Arantor/release-2.1

A few minor things