Essentially re-wrote Gruntfile