Fix 0.4.0rc1 build

First run at fixing the build. Still a ways to go but grunt will be functional again.