Grunt: various fixes

Was already merged in Bitbucket before import, marked as merged by the import user

List of fixes included :

• Fix grunt watch
• Clean up a little Gruntfile.js
• Remove matchdep dependency