Here's my next patch submission after an initial review from Dan.

Changes from last submission:
* make pep8 tester happy
* move "common" code to settings.py for review

Regards,
Nathan