Update to use bengott:avatar package for all user avatars