Merge pull request #927 from Oldiesmann/release-2.1

! Un-break the upgrade... (fixes #926)
Merge pull request #929 from Oldiesmann/release-2.1

! Spellcheck enhancements
Merge pull request #930 from Oldiesmann/release-2.1

! Don't throw errors if there aren't any questions when saving spam sett...