Feature/883 hierarchical custom settings 2

# Warning 
# Info 
# Issues
Fixes #883.
seems like you are now always updating or inserting org settings every time this is first called in the running context. Shouldn't you only do the update if we need to change values, or no values exist?