GruntFile - cleaned up / updated