Updated for Firefox 29 new toolbar. Updated for Addon SDK 1.16