Delayed controller selection

Merged Michael Tross requested to merge mtross/heating-controller:delayed-controller-selection into master Jan 12, 2016