Correctly map Omnipay card brand and SagePay CardType