use common settings as default to prevent local_settings from being overidden by default_settings
Merge pull request #139 from onaio/settings_restructure

use common settings as default to prevent local_settings from being overidden by default_settings