Update gruntfile.js
Update CONTRIBUTING.md
Update watch.js
Merge