Use django.conf.settings to allow us to override attributes
Fixed a typo
Merge branch 'master' into kingman