Problem with SWITCH and SOLO card validation

Seems I was a little hasty with the regex, and forgot to add the ccv validation too The attached patch should be applied to the trunk, and adds SWITCH and SOLO ccv validation as well as fixing a couple of issues with the actual credit card validation.