Merge pull request #25 from supherman/javascript-fixes

Refactor conekta token generation scripts
Merge pull request #26 from supherman/credit-card-fix

Credit card fix to avoid conflicts with other payment gateways
Merge remote-tracking branch 'upstream/master'

* upstream/master: