make npm test use grunt, fix up grunt config