fix for cc type for chrome / safari

Fixes #117
Fix typo on Diners Club stripe.js
set merchant_account_id in options to exclude "" from being passed to braintree

Fixes #122