Settings refactoring (WIP)
Fixes
Merge branch 'development' of https://github.com/UsabilityDynamics/wp-property into development