Sync with upstream

c965b72

device-tracker.yaml

 - platform: mqtt
   qos: 1
   devices:
-    cl_samsung_s5: smartthings/CL Samsung S5/presence
-    eh_nexus_6: smartthings/EH Nexus 6/presence
     green_keys: smartthings/Green Keys/presence
+- platform: asuswrt
+  host: 192.168.1.1
+  protocol: ssh
+  mode: router
+  username: -
+  ssh_key: -

known_devices.yaml

+green_keys:
+  name: Green Keys
+  mac: 
+  picture: 
+  track: yes
+  hide_if_away: no
+
+eh_nexus_6:
+  name: EH Nexus 6
+  mac: -
+  picture: 
+  track: yes
+  hide_if_away: no
+
+cl_samsung_s5:
+  name: CL Samsung S5
+  mac: -
+  picture: 
+  track: yes
+  hide_if_away: no