Gruntfile edits from master