Update settings.py
Merge branch 'master' of github.com:ekmartin/Tacnet