not sure what this is about
Merge remote-tracking branch 'origin/checkout_with_dwolla' into checkout_with_dwolla