Cleanup and Testing added to the Gruntfile