valid django 1.3+ settings
Merge pull request #21 from FPurchess/settings

valid django 1.3+ settings