added gravatar as well
Merge branch 'protocol-specific-urls'