Pull request to eldarion/master from fredpalmer/bug/credit-card-updates

Please pull these commits into eldarion/master.  Here is the latest commit message:

*"Spelling error - also see this for how to patch settings in Django:"*