diff --git a/.travis.yml b/.travis.yml
index e017990d..ab9b2f78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,38 +6,29 @@ services:
 python:
 - 3.6
 install:
-  # Make a wheel and install it to test to catch possible
-  # issues with releases
-  - pip install --upgrade setuptools pip
-  - pip install -r dev-requirements.txt
-  - python setup.py bdist_wheel
-  - pip install dist/*.whl
-
+- pip install --upgrade setuptools pip
+- pip install -r dev-requirements.txt
+- python setup.py bdist_wheel
+- pip install dist/*.whl
 script:
-  # cd into tests so CWD being repo2docker does not hide
-  # possible issues with MANIFEST.in
-  - if [ ${REPO_TYPE} == "r" ];
-    then cd tests && travis_wait pytest --cov repo2docker -v ${REPO_TYPE};
-    else cd tests && travis_retry pytest --cov repo2docker -v ${REPO_TYPE};
-    fi
-
+- if [ ${REPO_TYPE} == "r" ]; then cd tests && travis_wait pytest --cov repo2docker
+  -v ${REPO_TYPE}; else cd tests && travis_retry pytest --cov repo2docker -v ${REPO_TYPE};
+  fi
 after_success:
-  - pip install codecov
-  - codecov
-
+- pip install codecov
+- codecov
 jobs:
   include:
-    - stage: deploy
-      script: skip
-      if: type = push
-      env:
-        - REPO_TYPE=
-      deploy:
-        provider: script
-        script: "./travis/travis-script.bash"
-        on:
-          branch: master
-
+  - stage: deploy
+    script: skip
+    if: type = push
+    env:
+    - REPO_TYPE=
+    deploy:
+      provider: script
+      script: "./travis/travis-script.bash"
+      on:
+        branch: master
 env:
   matrix:
   - REPO_TYPE=conda
@@ -51,9 +42,18 @@ env:
   - secure: gX7IOkbjlvcDwIH24sOLhutINx6TZRwujEusMWh1dqgYG2D69qQai/mTrRXO9PGRrsvQwIBk4RcILKAiZnk5O2Z1hLoIHk/oU2mNUmE44dDm4Xf/VTTdeYhjeOTR9B+KJ9NVwPxuSEDSND3lD7yFfvCqNXykipEhBtTliLupjWVxxXnaz0aZTYHUPJwanxdUc06AphSPwZjtm1m3qMUU8v7UdTGGAdW3NlgkKw0Xx2x5W31fW676vskC/GNQAbcRociYipuhSFWV4lu+6d8XF2xVO97xtzf54tBQzt6RgVfAKtiqkEIYSzJQBBpkQ6SM6yg+fQoQpOo8jPU9ZBjvaoopUG9vn8HRS/OtQrDcG3kEFnFAnaes8Iqtidp1deTn27LIlfCTl7kTFOp8yaaNlIMHJTJKTEMRhfdDlBYx7qiH8e9d/z37lupzY2loLHeNHdMRS1uYsfacZsmrnu9vAdpQmP1LuHivBPZEvgerinADaJiekelWOIEn956pDrno/YgnzP0i9LEBYnbbunqT8oEzLintNt5CXGdhkiG60j38McKCIn4sD6jbMMwgsqVFdClCBersyorKhOs7P8at5vX4xf8fMiKPC8LZPzYVIQYzCjmwSOFQ+Rzmz5gSj+DRTANKfHpzZCKZEF6amBYMGE1O5osF8m6M10vtW9ToK+s=
   - secure: Cfhb0BUT54JjEZD8n44Jj+o1lt5p32Lfg7W/euTyZ61YylDx0+XEYTzfWcwxOzH9fLpWr6dDrBMGHA/FPqsWA5BkoGdiBJ1OOVy2tmDRButctobWM3SVwa+Rhh8bZWlK8yKT2S3n6CtK4mesmjzdbUShL7YnKOSl8LBaTT5Y5oT8Oxsq51pfg8fJUImim8H20t8H7emaEzZorF4OSGRtajcAgukt5YoAqTEVDq+bFRBHZalxkcRqLhsGe3CCWa28kjGTL4MPZpCI6/AXIXHzihfG3rGq40ZT8jZ9GPP3MBgkiJWtFiTC9h16G34b/JI/TD40zCmoW9/9oVjRK4UlLGCAv6bgzFhCRof2abhB9NTZDniNzkO0T15uHs3VLbLCPYB0xYyClAFxm2P6e8WPChyENKfTNh+803IKFFo4JaTjOnKzi89N72v5+bT6ghP932nmjJr1AO65xjw63CeDmaLoHDY73n11DibybWQgEeiNzJuSzbIHyqMPhW5XqeroEjKKstdPHtVfOViI9ywjEMy0HCPsspaVI7Aow0Iv8E4Ajvd32W7z0h0fSCx/i25hEOAo2vhBsmQKJA7IquB3N88M11L874h/8J+oc/osW1EB5z7Ukke5YCq94Qh3qImSIhJULXMMc1QjEqYsqhLXtiMG2HUge0Y5hwwnnbEIRMQ=
   - secure: KoOOJUp60vtvx/mXzoZWpvWgB6W3rr8I0gDWL2laCTgxo6HsTL+SSOY1l12SBE2jlvFmQqVwPPBfnp5Dudna2RQFF36eO2jUlISBkvK/q/GRmOQbjpAJRtVlan8Z4dlIf4az/oQ9G0ZUEfgUliVvS5MTrEPvKej3znug2zAH1t+H0U6aon1VJeVC+b94jsETGvQ7HHupqrr+DNGrNVHOgAazw7z4j+VtfZyfNaglnrKwYPeUljw3GIOXyFmP81t/cLiDY+IjPPepUYJFQIjCoVpIDm6UR70d4mzWf/LYWONEdh8LhDJZ2UyEtnUT2IPTdhqem1BfCAKUcLedHPk3S4Lcn0jL23os0klHeQvn9JRPEDV/Ib33XGcNEIXZi0pBkluUyhx8JgTz4e+KL8jKcyf9TRX7o/ViH7Ler6viliyMu15yfs2mJKAxzw6GFMtqGzhJ8tUXjguTozfjKTJKjBpkFoYdYbO9GqNkBQo2F7H+8zAmb4D4K0jzfOo8owjYLXJzOMJN5f5pKBqfLdjOtTxve4PrCgy4B8x7GDkW41SuRz2pkVwRDMMJRCetLcbqpEK+8b9Oy/inlxt7/56oS/tvvAtBj2FlLGBPQJKpwyZozIY9XqXWu8u+VbRsSTqbRtdSHzzKyQ25a03dc7KDHmyoDAlzyehe6cHPWp1UqXg=
-
 matrix:
   include:
-    - python: 3.4
-      env:
-        - REPO_TYPE=venv
+  - python: 3.4
+    env:
+    - REPO_TYPE=venv
+deploy:
+  provider: pypi
+  user: betatim
+  distributions: sdist bdist_wheel
+  on:
+    tags: true
+    repo: jupyter/repo2docker
+    condition: "$REPO_TYPE = conda"
+  password:
+    secure: pF7wWm9m0tR+IXd8YBsYj4iqV+MlaM01I/fi3V/jDGDUNxLI8G4/0tJWeT1qIMY0YNr3QE2AE09UNdYkxz3A3bEw+3cNwIzAYAuwgFl7RO9xjMQvXMhiH9MNFJ2DKmHqPdMg/gI9g6WGUvGCLNhXT7DJmNiEE6D2mD6v8MN+E8rrv2TIej/f7nbPR2yfpHO54/PtLqiRAouGg6HaUkOmuzi84d1bexjpAhVBux/U6zSRy0wWOXzq6kuZpP3xO0xt5po3sYAZT3njB6ca2dxeaoPj2bb66JQ2mHT5snKpkMuJZfl66L55ItVnCnS0YpIa+j5MoW9pJAacmTEQ+hmWDxOj7yBFKjZ35PIhywde38+UuEZ3wU3TNp9wySTKEnxr9d2GX7K0d2X+G3DaN1AcFtQLjTJiJbLdIy5CuhCEFHX53w09H6MuAwbFMj6d4gkVhd2tBI8tv3G1bCQAu7lc8F1q0wRF9C1uvd/nqL+BDHab1VyeC5d96E2WdtqkqbGGIQ7IRzqlrCFKUiDLhRAkZxAdxc98lFfSiBgKeJDEja7gX1kQ4z/YSlBkUjRQb7InBfKjUQFhLVV/zSFX/UOw0/J5wi/xGOFHILbt5vWQ5CHjDr/gXeXzF3lcKzl97uuZFHwkuzsaHJMZeM2++F4sGw9OkQ9GDLDOD0EBeMvsP5Q=
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index c9a31224..dd4ef8c9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -236,34 +236,14 @@ If you do not have access to any of these, please contact a current maintainer o
 ## Release Process Steps
 
 1. Make a PR bumping version number of repo2docker in the
-   `setup.py` file (like https://github.com/jupyter/repo2docker/pull/221),
+   `setup.py` file and `reop2docker/__init__.py` ,
    get it merged, and make sure your local checkout is the
    same as `master` on GitHub.
 
-2. In your environment, install packages needed to make releases:
-   ```bash
-   pip install wheel twine
-   ```
+2. Make a new release on GitHub. When the tag is create travis will build
+   and deploy that tag as the latest release.
 
-3. Clean out the `dist` directory and then build the `wheel` and `tar.gz` files:
-   ```bash
-   rm -f dist/*
-   python setup.py sdist bdist_wheel
-   ```
-4. Once tests pass, time to upload!
-   ```bash
-   twine upload dist/*
-   ```
-
-   This might ask for your PyPI username and password.
-
-5. Make a git tag and push it to GitHub:
-   ```bash
-   git tag -a v<version>
-   git push official --tags
-   ```
-
-6. Tag and push a docker image:
+3. Tag and push a docker image:
    ```bash
    docker build -t jupyter/repo2docker:v<version> .
    docker push jupyter/repo2docker:v<version>