Changes to improve audit deploy and for better PHP compat
Fixed bug if settings not present
Merge remote-tracking branch 'origin/user_settings_updates' into curtis_banks