GerryG/wagn — pull request #36 by GerryG (2013-02-11 16:12:25+00:00)
Title: This is supposed to be mostly simple cleanups and renames

But I managed to also import some brokenness from account_cards. That may be a good thing as the problem was harder to narrow down over there.

Fixing it here would be the idea. Your comments and feedback requested.