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