Fixed typo in function name
Merge pull request #3017 from dpwrussell/function_name_correction

Fixed typo in function name
refactoring settings.py

 - adding documentation
 - reordering and grouping