http-conduit version bump.
Merge branch 'master' of https://github.com/michaelschade/hs-stripe
added cardId to Card data constructor w/ json instances