Correctly map Omnipay card brand and SagePay CardType

Hopefully this will pass the travis build unlike #92