fix for cc type for chrome / safari

Fixes #117
Fix spec involving credit card record

CreditCard now requires a name presence instead of first_name and
last_name
Fix typo on Diners Club stripe.js
set merchant_account_id in options to exclude "" from being passed to braintree

Fixes #122