Some more cleanups before actually trying out the new sun hubot.

Auditors: ben, chris

Test Plan:
Fingers crossed.  Will deploy to toby and try it out!