Bug 984365 - Fix require loop; r=mratcliffe

This also removes an unused require in addon.js, discovered during the
investigation.