Fix duplicate settings
Re-add missing settings
Re-add AWS
Merge pull request #74 from LocalData/settings-fix

Remove duplicate settings file