CURRIED SHRIMP AND MACARONI SALAD