From Hmal to erb
Merge pull request #1 from bmneely/stripe-without-weird-hmal

From Hmal to erb