Improved grunt tasks