Bug 1109630 - Improve and Refactor grunt system

no worries, I'll fix it and you will buy me a beer