Bug 1040669 - Fix badge awarded emails so that they have usernames and review comments

This fixes the "badge awarded" emails not being provided with user information (user info was only fetched in the case of hive badges).  It also fixes the comments from reviews not being properly passed on (this latter part will still be broken in production and staging until a badgekit api deployment happens, which should be soon).
Fair enough, added for good measure.