David suggestions implemented.

Avatar images takes precedence if both gravatar email and
avatar are provided. Language for avatar image makes it
clear that avatar takes prcedence.