Add npm and grunt back to dev dependencies