Code cleanup for gravatar.php
Merge branch 'dstockto-gravatar_cleanup'