Rewrite Grunt tasks for efficiency
Merge branch 'optimize'