Sync with upstream

399ceba

Sync with upstream
dae53408 · Erick Hitter · 38a5b77f · dae53408 · dae53408 · dae53408
Verified Commit dae53408 authored 8 years ago by Erick Hitter
--- a/sensors/battery-living-room-alarm.yaml
+++ b/sensors/battery-living-room-alarm.yaml
--- a/sensors/battery-master-bedroom-alarm.yaml
+++ b/sensors/battery-master-bedroom-alarm.yaml
--- a/sensors/battery-master-bedroom-window.yaml
+++ b/sensors/battery-master-bedroom-window.yaml
--- a/sensors/battery-office-cabinet.yaml
+++ b/sensors/battery-office-cabinet.yaml
--- a/sensors/battery-office-far-wall.yaml
+++ b/sensors/battery-office-far-wall.yaml
--- a/sensors/battery-office-near-closet.yaml
+++ b/sensors/battery-office-near-closet.yaml
--- a/sensors/battery-office-window.yaml
+++ b/sensors/battery-office-window.yaml
--- a/sensors/battery-slider.yaml
+++ b/sensors/battery-slider.yaml
--- a/sensors/cpuspeed.yaml
+++ b/sensors/cpuspeed.yaml
+platform: cpuspeed
+name: CPU
--- a/sensors/fastcom.yaml
+++ b/sensors/fastcom.yaml
--- a/sensors/power-lava-lamp.yaml
+++ b/sensors/power-lava-lamp.yaml
--- a/sensors/speedtest.yaml
+++ b/sensors/speedtest.yaml
--- a/sensors/systemmonitor.yaml
+++ b/sensors/systemmonitor.yaml
--- a/sensors/temperature-above-slider.yaml
+++ b/sensors/temperature-above-slider.yaml
--- a/sensors/temperature-above-utility-closet.yaml
+++ b/sensors/temperature-above-utility-closet.yaml
--- a/sensors/temperature-dining-area-window.yaml
+++ b/sensors/temperature-dining-area-window.yaml
--- a/sensors/temperature-front-door.yaml
+++ b/sensors/temperature-front-door.yaml
--- a/sensors/temperature-kitchen.yaml
+++ b/sensors/temperature-kitchen.yaml
--- a/sensors/temperature-master-bedroom-window.yaml
+++ b/sensors/temperature-master-bedroom-window.yaml
--- a/sensors/temperature-office-cabinet.yaml
+++ b/sensors/temperature-office-cabinet.yaml