! I like this. It feels ugly, though, but it works (non AJAXively for now)

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

! I like this. It feels ugly, though, but it works (non AJAXively for no...