Settings services to be singletons, fix for #360
Merge pull request #361 from glennblock/360

Settings services to be singletons, fix for #360