Merging options back with data
Fix
Fixing issue #158
I thought this was fixed in the last release, but HA is fighting back. When the integration is configured, it saves it in data. But when the configuration is changed, it saves it in options.
I am merging the two places to keep the config in data, and keep options clean.