Merge pull request #548 from bengott/avatar-tweaks

Upgrade to bengott:avatar 0.6.0