Compare and review package.json and gruntfile diffs

I pushed without committing, just found I had untracked changes. Compare and marge differences.