Don't put payment specific settings in local_settings template.
Automated merge with ssh://bitbucket.org/stephenmcd/cartridge
Fix AttributeError with empty cart in Django 1.5

Django 1.5 looks for a pk in BaseInlineFormSet's __init__, which it couldn't find on EmptyCart. The fix adds the attribute with value None.
Merge