BUG: 927036

https://bugzilla.mozilla.org/show_bug.cgi?id=927036
Refactor userbar code to no longer mention "butter"