[#927036]Refactor userbar code to no longer mention "butter"
Merge branch 'master' of https://github.com/mrsonord/thimble.webmaker.org