Revert "Bug 914185 - Switch webmaker.org to use Webmaker Butler r=cade,daleee"

This reverts commit 9ee4a441232061584a352d8a64c6e012e62254af.