Removed duplicate code in gruntfile.js
Fixed templating folders for view subgenerators
Updated watch.js task to use _.merge for doc config and regular config