Cleanup and update of Gruntfile