Merge pull request #4 from drkitty/split-settings

Split settings into base and local
Incorporate South