Sync with upstream, add my thermostat to pepperdb