Rescan on timeout and notifications
Merge pull request #13 from vermilion/Exp_SettingsRescan

Rescan on timeout and notifications