diff --git a/.gitignore b/.gitignore
index ca9b124ac..66409fb86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,5 +11,8 @@ resources/bootstrap.inc.sh
 resources/.bootstrap-version
 _common/
 
+# State files
+_control/debug
+
 # Cache of keyboard metadata, deleted on site rebuild
 keyboard/index.cache
\ No newline at end of file
diff --git a/.htaccess b/.htaccess
index ee94c4573..e496cf124 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,4 +1,13 @@
 
+php_value display_errors off
+php_value display_startup_errors off
+php_value include_path ".:/var/www/html/_includes/"
+
+<IfFile /var/www/html/_control/debug>
+  php_value display_startup_errors on
+  php_value display_errors stderr
+</IfFile>
+
 # We turn off automatic addition of slashes for directories because it
 # interferes with the file extension removal for .php files. At the bottom of
 # this file, we have a redirect rule to mimic the same behaviour, _after_ the
diff --git a/.user.ini b/.user.ini
deleted file mode 100644
index e7bf51528..000000000
--- a/.user.ini
+++ /dev/null
@@ -1 +0,0 @@
-include_path=".;${DOCUMENT_ROOT}/_includes"
\ No newline at end of file
diff --git a/Readme.md b/Readme.md
index ea0b03086..706e13160 100644
--- a/Readme.md
+++ b/Readme.md
@@ -30,7 +30,7 @@ On Windows host machines, do one of these two options:
 1. Run `./build.sh build`.
 
 #### Start the Docker container
-1. Run `./build.sh start`.
+1. Run `./build.sh start --debug`.
 
 After this, you can access the help.keyman site at http://localhost:8055
 
diff --git a/build.sh b/build.sh
index a5937e8ec..176fb4076 100755
--- a/build.sh
+++ b/build.sh
@@ -2,7 +2,7 @@
 ## START STANDARD SITE BUILD SCRIPT INCLUDE
 readonly THIS_SCRIPT="$(readlink -f "${BASH_SOURCE[0]}")"
 readonly BOOTSTRAP="$(dirname "$THIS_SCRIPT")/resources/bootstrap.inc.sh"
-readonly BOOTSTRAP_VERSION=v0.10
+readonly BOOTSTRAP_VERSION=v0.11
 [ -f "$BOOTSTRAP" ] && source "$BOOTSTRAP" || source <(curl -fs https://raw.githubusercontent.com/keymanapp/shared-sites/$BOOTSTRAP_VERSION/bootstrap.inc.sh)
 ## END STANDARD SITE BUILD SCRIPT INCLUDE