CURRIED SHRIMP MACARONI SALAD