Update to use bengott:avatar 0.1.2
Merge pull request #487 from bengott/avatar-tweaks

Update to use bengott:avatar 0.1.2
Merge remote-tracking branch 'upstream/master' into master-upstream