REfactor gruntfile
Manual merge