Fixes #149. When a stripe charge is created with both a customer and card parameters the card is assumed to be a card id (not a token). added test to ensure proper functionality
Fixes #149. Modified the behaviour of creating a charge with a customer and and a card id such that the return value of the card is the actual card object, and not simply the id which was passed in
Merge branch 'master' of https://github.com/shorrockin/stripe-ruby-mock