Moved a number of settings to local_settings.py
Merge pull request #3 from stewart/master

Moved a number of settings from settings into local_settings