Refactored the way settings are imported.

Removed all magical stuff and instead import local_settings if it
exists.
Merge branch 'remove_settings_magic' into baseline_master