updated gruntfile
fixed conflicts from pull request