! Clean up more old settings not in use any more, fixes #1252

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! Missed this one from Mantis 1493 (did previously, forgot to commit)

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! We have this nice standardised code and we don't use it properly. So let's use it properly and fix #1250 in the process (hopefully)

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge branch 'release-2.1' of https://github.com/SimpleMachines/SMF2.1 into release-2.1
! These don't appear to be in use anywhere

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! A setting we don't really need.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! And some more icon spriting combination magic.

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

Merging various goodies