Updated gruntfile and NPM packages