! Fix Gravatar issues

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! Don't allow selecting "No Avatar" if we're forcing Gravatar

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! A couple more Gravatar-related tweaks

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #2590 from Oldiesmann/release-2.1

! Fix Gravatar issues