simplification in Gruntfile; rebuilding of packages after merging with upstream project