updates to Gruntfile.js
merging