Bug 1109630 - Improve and Refactor grunt system

And then those will fail cause they're missing a var;)