! More housecleaning

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! More housecleaning

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! Yay for housecleaning

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

We love housecleaning