Refactor avatar method and corresponding views to be more concise.
Merge pull request #28 from danbartlett/avatar

Refactor avatar method and corresponding views to be more concise.