Removed redundant comment
Master settings.py template
Merge remote-tracking branch 'origin/master'