Blog avatars take priority over user photos
Merge branch 'master' into kirsle.net