Bring grunt up-to-date
Clean up Gruntfile