Convert from two objects in chrome storage to a single consolidated object
Merge branch 'master' of github.com:zkaarvik/TekSavvyUsageMeter