diff --git a/.gitignore b/.gitignore
index 6002612c13..b004947390 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,6 +75,7 @@ venv.bak/
 
 .pioenvs
 .piolibdeps
+.pio
 .vscode
 CMakeListsPrivate.txt
 CMakeLists.txt
diff --git a/esphome/voluptuous_schema.py b/esphome/voluptuous_schema.py
index 13f4c5d6b8..09fa1a6756 100644
--- a/esphome/voluptuous_schema.py
+++ b/esphome/voluptuous_schema.py
@@ -21,8 +21,8 @@ def ensure_multiple_invalid(err):
 # pylint: disable=protected-access, unidiomatic-typecheck
 class _Schema(vol.Schema):
     """Custom cv.Schema that prints similar keys on error."""
-    def __init__(self, schema, extra=vol.PREVENT_EXTRA, extra_schemas=None):
-        super(_Schema, self).__init__(schema, extra=extra)
+    def __init__(self, schema, required=False, extra=vol.PREVENT_EXTRA, extra_schemas=None):
+        super(_Schema, self).__init__(schema, required=required, extra=extra)
         # List of extra schemas to apply after validation
         # Should be used sparingly, as it's not a very voluptuous-way/clean way of
         # doing things.
diff --git a/platformio.ini b/platformio.ini
index 5e6c64af7b..98f837a571 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -4,7 +4,7 @@
 ; It's *not* used during runtime.
 
 [platformio]
-env_default = livingroom8266
+default_envs = livingroom8266
 src_dir = .
 include_dir = include
 
diff --git a/script/.neopixelbus.patch b/script/.neopixelbus.patch
index 9d52a1f9f3..e1bbd5da99 100644
--- a/script/.neopixelbus.patch
+++ b/script/.neopixelbus.patch
@@ -1,5 +1,5 @@
---- .piolibdeps/NeoPixelBus_ID547/src/internal/NeoEsp8266DmaMethod.h	2019-06-25 11:14:33.000000000 +0200
-+++ .piolibdeps/NeoPixelBus_ID547/src/internal/NeoEsp8266DmaMethod.h.2	2019-06-25 11:14:40.000000000 +0200
+--- .pio/libdeps/livingroom8266/NeoPixelBus_ID547/src/internal/NeoEsp8266DmaMethod.h	2019-06-25 11:14:33.000000000 +0200
++++ .pio/libdeps/livingroom8266/NeoPixelBus_ID547/src/internal/NeoEsp8266DmaMethod.h.2	2019-06-25 11:14:40.000000000 +0200
 @@ -195,7 +195,12 @@
              _i2sBufDesc[indexDesc].sub_sof = 0;
              _i2sBufDesc[indexDesc].datalen = blockSize;