Merged default_setttings files. Updated staging/production settings files and moved any project-specific settings to the deployment files [PD-199]