Wizard bug fixes

Fixes #1332
Fixes #1333 
Gotcha.

Then what about making calibrationTimeout not do anything if the calibration has completed. Basically have a variable for calibration state (we already do that in the main config page) and wrap it with a mutexLocker. That's probably more safe against race conditions anyway.

Or make the QTimer a class variable and destroy it in the destructor.