Merge pull request #940 from rustyswayne/1.5.0

Fixes issue with shipment number generation
Braintree Update payment method revisions