Update package.json with latest libs; reorder lib references to more closely match upstream master package.json