Cleanup of Gruntfile.js and dependency fixing