diff --git a/.editorconfig b/.editorconfig
index a93039f33..874a0b40a 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,9 +4,9 @@ root = true
 end_of_line = lf
 insert_final_newline = true
 charset = utf-8
+indent_size = 2
 indent_style = space
 trim_trailing_whitespace = true
-indent_size = 2
 
 [*.{js,bs}]
 max_line_length = 120
@@ -16,3 +16,6 @@ indent_style = tab
 
 [Makefile]
 indent_style = tab
+
+[.travis.yml]
+indent_size = 2
diff --git a/.gitignore b/.gitignore
index 01b42eb0a..a9e77d4d4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
-/node_modules/
-/npm-debug.log
 /streams.spec.whatwg.org/
-/index.html
-/index.html.*
 /deploy.sh
+/deploy_key
+/deploy_key.pub
+/index.html
 /review.sh
+/index.html.*
+/node_modules/
+/npm-debug.log
diff --git a/.pr-preview.json b/.pr-preview.json
index fe7effb94..4b2477666 100644
--- a/.pr-preview.json
+++ b/.pr-preview.json
@@ -2,14 +2,10 @@
     "src_file": "index.bs",
     "type": "bikeshed",
     "params": {
-        "md-status": "LS-COMMIT",
-        "md-warning": "Commit {{ sha }} {{ pull_request.head.repo.html_url }}/commit/{{ sha }} replaced by {{ config.ls_url }}",
-        "md-title": "{{ config.title }} (Pull Request Snapshot #{{ pull_request.number }})",
-        "md-Text-Macro": "SNAPSHOT-LINK {{ config.back_to_ls_link }}"
+        "force": 1,
+        "md-status": "LS-PR",
+        "md-Text-Macro": "PR-NUMBER {{ pull_request.number }}"
     },
-    "ls_url": "https://streams.spec.whatwg.org/",
-    "title": "Streams Standard",
-    "back_to_ls_link": "<a href=\"https://streams.spec.whatwg.org/\" id=\"commit-snapshot-link\">Go to the living standard</a>",
     "post_processing": {
         "name": "emu-algify",
         "options": {
diff --git a/Makefile b/Makefile
index f8a940c54..cf8a4e24a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,6 @@
+SHELL=/bin/bash -o pipefail
+.PHONY: local remote deploy review
+
 remote: index.bs
 	curl https://api.csswg.org/bikeshed/ -f -F file=@index.bs > index.html.postbs -F md-Text-Macro="SNAPSHOT-LINK LOCAL COPY"
 	node_modules/.bin/emu-algify --throwing-indicators < index.html.postbs > index.html
diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..c1515a573
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,15 @@
+<!--
+Thank you for contributing to the Streams Standard! Please describe the change you are making and complete the checklist below if your change is not editorial.
+-->
+
+- [ ] At least two implementers are interested (and none opposed):
+   * …
+   * …
+- [ ] [Tests](https://github.com/web-platform-tests/wpt) are written and can be reviewed and commented upon at:
+   * …
+- [ ] [Implementation bugs](https://github.com/whatwg/meta/blob/master/MAINTAINERS.md#handling-pull-requests) are filed:
+   * Chrome: …
+   * Firefox: …
+   * Safari: …
+
+(See [WHATWG Working Mode: Changes](https://whatwg.org/working-mode#changes) for more details.)