Improved grunt config