diff --git a/.travis.yml b/.travis.yml
index 89502a8..6a7e035 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,14 @@ language: generic
 env:
   global:
     - ENCRYPTION_LABEL="eaa0f98d3fae"
-    - CHECKER_PARAMS='\&filterpattern=Text%20run%20is%20not%20in%20Unicode%20Normalization%20Form%20C\.\|.*appears%20to%20be%20written%20in.*\|.*Charmod%20C073.*'
+    - DEPLOY_USER="annevankesteren"
+    - CHECKER_FILTER="Text run is not in Unicode Normalization Form C\.|.*appears to be written in.*|.*Charmod C073.*"
+    - EXTRA_FILES="*.txt *.json *.css"
+    - POST_BUILD_STEP='python visualize.py "$DIR/"'
+
 script:
-  - bash ./deploy.sh
+  - curl --remote-name --fail https://resources.whatwg.org/build/deploy.sh && bash ./deploy.sh
+
 notifications:
   email:
     on_success: never
diff --git a/deploy.sh b/deploy.sh
deleted file mode 100755
index b974c5d..0000000
--- a/deploy.sh
+++ /dev/null
@@ -1,141 +0,0 @@
-#!/bin/bash
-set -e
-
-DEPLOY_USER="annevankesteren"
-
-TITLE="Encoding Standard"
-LS_URL="https://encoding.spec.whatwg.org/"
-COMMIT_URL_BASE="https://github.com/whatwg/encoding/commit/"
-BRANCH_URL_BASE="https://github.com/whatwg/encoding/tree/"
-
-INPUT_FILE="encoding.bs"
-SERVER="encoding.spec.whatwg.org"
-WEB_ROOT="encoding.spec.whatwg.org"
-COMMITS_DIR="commit-snapshots"
-BRANCHES_DIR="branch-snapshots"
-
-RUN_HTML_CHECKER_ON_ALL_HTML_OUTPUT=false
-RUN_HTML_CHECKER_ON_SPEC_HTML=false
-
-if [ "$1" != "--local" -a "$DEPLOY_USER" == "" ]; then
-    echo "No deploy credentials present; skipping deploy"
-    exit 0
-fi
-
-if [ "$1" == "--local" ]; then
-    echo "Running a local deploy into $WEB_ROOT directory"
-    echo ""
-fi
-
-SHA="`git rev-parse HEAD`"
-BRANCH="`git rev-parse --abbrev-ref HEAD`"
-if [ "$BRANCH" == "HEAD" ]; then # Travis does this for some reason
-    BRANCH=$TRAVIS_BRANCH
-fi
-
-if [ "$BRANCH" == "master" -a "$TRAVIS_PULL_REQUEST" != "false" -a "$TRAVIS_PULL_REQUEST" != "" ]; then
-    echo "Skipping deploy for a pull request; the branch build will suffice"
-    exit 0
-fi
-
-BACK_TO_LS_LINK="<a href=\"/\" id=\"commit-snapshot-link\">Go to the living standard</a>"
-SNAPSHOT_LINK="<a href=\"/commit-snapshots/$SHA/\" id=\"commit-snapshot-link\">Snapshot as of this commit</a>"
-
-echo "Branch = $BRANCH"
-echo "Commit = $SHA"
-echo ""
-
-rm -rf $WEB_ROOT || exit 0
-
-# Commit snapshot
-COMMIT_DIR=$WEB_ROOT/$COMMITS_DIR/$SHA
-mkdir -p $COMMIT_DIR
-curl https://api.csswg.org/bikeshed/ -f -F file=@$INPUT_FILE -F md-status=LS-COMMIT \
-     -F md-warning="Commit $SHA $COMMIT_URL_BASE$SHA replaced by $LS_URL" \
-     -F md-title="$TITLE (Commit Snapshot $SHA)" \
-     -F md-Text-Macro="SNAPSHOT-LINK $BACK_TO_LS_LINK" \
-     > $COMMIT_DIR/index.html;
-cp *.txt $COMMIT_DIR/;
-cp *.json $COMMIT_DIR/;
-cp *.css $COMMIT_DIR/;
-python visualize.py $COMMIT_DIR/;
-echo "Commit snapshot output to $WEB_ROOT/$COMMITS_DIR/$SHA"
-echo ""
-
-if [ $BRANCH != "master" ] ; then
-    # Branch snapshot, if not master
-    BRANCH_DIR=$WEB_ROOT/$BRANCHES_DIR/$BRANCH
-    mkdir -p $BRANCH_DIR
-    curl https://api.csswg.org/bikeshed/ -f -F file=@$INPUT_FILE -F md-status=LS-BRANCH \
-         -F md-warning="Branch $BRANCH $BRANCH_URL_BASE$BRANCH replaced by $LS_URL" \
-         -F md-title="$TITLE (Branch Snapshot $BRANCH)" \
-         -F md-Text-Macro="SNAPSHOT-LINK $SNAPSHOT_LINK" \
-         > $BRANCH_DIR/index.html;
-    cp *.txt $BRANCH_DIR/;
-    cp *.json $BRANCH_DIR/;
-    cp *.css $BRANCH_DIR/;
-    python visualize.py $BRANCH_DIR/;
-    echo "Branch snapshot output to $WEB_ROOT/$BRANCHES_DIR/$BRANCH"
-else
-    # Living standard, if master
-    curl https://api.csswg.org/bikeshed/ -f -F file=@$INPUT_FILE \
-         -F md-Text-Macro="SNAPSHOT-LINK $SNAPSHOT_LINK" \
-         > $WEB_ROOT/index.html
-    cp *.txt $WEB_ROOT/;
-    cp *.json $WEB_ROOT/;
-    cp *.css $WEB_ROOT/;
-    python visualize.py $WEB_ROOT/;
-    echo "Living standard output to $WEB_ROOT"
-fi
-
-echo ""
-find $WEB_ROOT -print
-echo ""
-
-if [ "$TRAVIS" == "true" ]; then
-    for file in $(git diff --name-only "$TRAVIS_COMMIT_RANGE"); do
-        if [ "$file" == "encoding.bs" ]; then
-          RUN_HTML_CHECKER_ON_SPEC_HTML=true
-        fi
-        if [ "$file" == "visualize.py" ]; then
-          RUN_HTML_CHECKER_ON_ALL_HTML_OUTPUT=true
-        fi
-        if [ "${file: -4}" == ".txt" ]; then
-          RUN_HTML_CHECKER_ON_ALL_HTML_OUTPUT=true
-        fi
-    done
-    if [ "$RUN_HTML_CHECKER_ON_ALL_HTML_OUTPUT" == "true" ]; then
-        (find "$WEB_ROOT" -name "*.html" -exec bash -c "echo Checking \$1...; \
-            curl -s -H 'Content-Type: text/html; charset=utf-8' \
-                --data-binary @\$1 \
-                --retry 5 \
-                https://checker.html5.org/?out=gnu\&file=\$1$CHECKER_PARAMS \
-            | tee -a OUTPUT; echo" _ {} \;);
-        if [ -s OUTPUT ]; then
-            exit 1;
-        fi
-    elif [ "$RUN_HTML_CHECKER_ON_SPEC_HTML" == "true" ]; then
-        (find . -name "index.html" -exec bash -c "echo Checking \$1...; \
-            curl -s -H 'Content-Type: text/html; charset=utf-8' \
-                --data-binary @\$1 \
-                --retry 5 \
-                https://checker.html5.org/?out=gnu\&file=\$1$CHECKER_PARAMS \
-            | tee -a OUTPUT; echo" _ {} \;);
-        if [ -s OUTPUT ]; then
-            exit 1;
-        fi
-    fi
-
-    # Get the deploy key by using Travis's stored variables to decrypt deploy_key.enc
-    ENCRYPTED_KEY_VAR="encrypted_${ENCRYPTION_LABEL}_key"
-    ENCRYPTED_IV_VAR="encrypted_${ENCRYPTION_LABEL}_iv"
-    ENCRYPTED_KEY=${!ENCRYPTED_KEY_VAR}
-    ENCRYPTED_IV=${!ENCRYPTED_IV_VAR}
-    openssl aes-256-cbc -K $ENCRYPTED_KEY -iv $ENCRYPTED_IV -in deploy_key.enc -out deploy_key -d
-    chmod 600 deploy_key
-    eval `ssh-agent -s`
-    ssh-add deploy_key
-
-    # scp the output directory up
-    scp -r -o StrictHostKeyChecking=no $WEB_ROOT $DEPLOY_USER@$SERVER:
-fi