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

Bug 1093929 - Improve grunt tasks and add additional options r=jaoo
(cherry picked from commit 76d82cb8da5424be64688c731910ce6eceb2e3fd)