lots of updates, currently working
settings split and gitignore
Merge pull request #1 from brob/settings-split

Settings split