Merge in v1.11.2 from upstream.

Author: TheHackmeister

.github/ISSUE_TEMPLATE/bug_report.md

@@ -3,8 +3,8 @@
 
 **Related issue (if applicable):** fixes <link to issue>
 
-**Pull request in [esphomedocs](https://github.com/OttoWinter/esphomedocs) with documentation (if applicable):** OttoWinter/esphomedocs#<esphomedocs PR number goes here>
-**Pull request in [esphomelib](https://github.com/OttoWinter/esphomelib) with C++ framework changes (if applicable):** OttoWinter/esphomelib#<esphomelib PR number goes here>
+**Pull request in [esphome-docs](https://github.com/esphome/esphome-docs) with documentation (if applicable):** esphome/esphome-docs#<esphome-docs PR number goes here>
+**Pull request in [esphome-core](https://github.com/esphome/esphome-core) with C++ framework changes (if applicable):** esphome/esphome-core#<esphome-core PR number goes here>
 
 ## Checklist:
   - [ ] The code change is tested and works locally.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -105,4 +105,4 @@ venv.bak/
 
 config
 tests/build/
-tests/.esphomeyaml/
+tests/.esphome/