Moved upgrade code out of constructor; Fixed code to not load defaults if an upgrade is needed; Made sure to transfer uninstall_save_settings
Merge remote-tracking branch 'origin/master'