Fix of a watch task plus cleaning of Gruntfile.js