In review, the id attribute of avatar services was changed to

avatar_service_id. This patch corrects all instances that were missed,

as well as fixing some unit tests that were missing an HTML class name

in the expected output.
This patch also updates the user resource to indicate multiple URLs are

being returned, as well as fixing a missing size parameter.

Ran unit tests.