Bug 1093929 - Improve grunt tasks and add additional options r=jaoo

Done!