A lot of work still needs to be done.
Removed the development settings

Settings files should not be checked-in to repo.
Merge branch 'wip'